# HG changeset patch
# User Esben Haabendal <eha@doredevelopment.dk>
# Date 1281823251 -7200
# Node ID 32f29d1e2db1832d39dc9dce5c58cf52a2f85813
# Parent  198c99380191e778dd5065eec39d83dc9f905463
mingw32: enable sysrooted toolchains

When targeting mingw32, gcc expects to find its include files
in "mingw/include" instead of the traditional "usr/include".

[Yann E. MORIN: split the original patch]

diff -r 198c99380191 -r 32f29d1e2db1 scripts/build/libc/mingw.sh
--- a/scripts/build/libc/mingw.sh	Sat Aug 14 23:21:06 2010 +0200
+++ b/scripts/build/libc/mingw.sh	Sun Aug 15 00:00:51 2010 +0200
@@ -44,6 +44,7 @@
     mkdir -p "${CT_HEADERS_DIR}"
     cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include/* \
           ${CT_HEADERS_DIR}
+    CT_DoExecLog ALL ln -sv "usr" "${CT_SYSROOT_DIR}/mingw"
 
     CT_EndStep
 }
@@ -65,6 +66,7 @@
     CT_DoExecLog ALL                                              \
     "${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
         --prefix=${CT_SYSROOT_DIR}                                \
+        --includedir=${CT_HEADERS_DIR}                            \
         --host=${CT_TARGET}
 
     CT_DoLog EXTRA "Building W32-API"
@@ -83,6 +85,7 @@
     CT_DoExecLog ALL                                                \
     "${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
         --prefix=${CT_SYSROOT_DIR}/                                 \
+        --includedir=${CT_HEADERS_DIR}                              \
         --host=${CT_TARGET}
 
     CT_DoLog EXTRA "Building MinGW Runtime"
@@ -95,6 +98,9 @@
 }
 
 do_libc_finish() {
+    # Remove the build-symlink now it is no longer needed.
+    CT_DoExecLog ALL rm -f "${CT_SYSROOT_DIR}/mingw"
+
     CT_DoStep INFO "Installing MinGW Development libraries"
 
     CT_Pushd "${CT_SYSROOT_DIR}"
@@ -120,7 +126,7 @@
         CT_DoLog EXTRA "Installing PDCurses development files"
         chmod a+r ${CT_SRC_DIR}/PDCurses-${CT_MINGW_PDCURSES_VERSION}/*.h
         cp ${CT_SRC_DIR}/PDCurses-${CT_MINGW_PDCURSES_VERSION}/*.h \
-           ${CT_HEADERS_DIR}
+           ${CT_HEADERS_DIR}/
         cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libpdcurses.a
         cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libncurses.a
     fi
@@ -137,6 +143,7 @@
             --build=${CT_BUILD}           \
             --host=${CT_TARGET}           \
             --prefix=${CT_SYSROOT_DIR}    \
+            --includedir=${CT_HEADERS_DIR}  \
             --enable-shared               \
             --enable-static