[PATCH 2 of 3] libc/mingw: use pre-set headers dir
Yann E. MORIN
yann.morin.1998@anciens.enib.fr
Sat Aug 14 21:59:00 GMT 2010
# HG changeset patch
# User Esben Haabendal <eha@doredevelopment.dk>
# Date 1281820866 -7200
# Node ID 198c99380191e778dd5065eec39d83dc9f905463
# Parent 2bcd716ca877e74b58f90271898ab48db2fe639b
libc/mingw: use pre-set headers dir
There is a variable that contains the headers directory,
so there's no need to re-compute it again.
[Yann E. MORIN: split the original patch]
diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh
--- a/scripts/build/libc/mingw.sh
+++ b/scripts/build/libc/mingw.sh
@@ -41,9 +41,9 @@
CT_DoStep INFO "Installing C library headers"
CT_DoLog EXTRA "Installing MinGW Runtime headers"
- mkdir -p "${CT_SYSROOT_DIR}/include"
- cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include \
- ${CT_SYSROOT_DIR}
+ mkdir -p "${CT_HEADERS_DIR}"
+ cp -r ${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/include/* \
+ ${CT_HEADERS_DIR}
CT_EndStep
}
@@ -60,7 +60,7 @@
mkdir -p "${CT_BUILD_DIR}/build-w32api"
cd "${CT_BUILD_DIR}/build-w32api"
- CFLAGS="-I${CT_SYSROOT_DIR}/include" \
+ CFLAGS="-I${CT_HEADERS_DIR}" \
LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
CT_DoExecLog ALL \
"${CT_SRC_DIR}/w32api-${CT_W32API_VERSION}-mingw32/configure" \
@@ -78,7 +78,7 @@
mkdir -p "${CT_BUILD_DIR}/build-mingwrt"
cd "${CT_BUILD_DIR}/build-mingwrt"
- CFLAGS="-I${CT_SYSROOT_DIR}/include" \
+ CFLAGS="-I${CT_HEADERS_DIR}" \
LDFLAGS="-L${CT_SYSROOT_DIR}/lib" \
CT_DoExecLog ALL \
"${CT_SRC_DIR}/mingwrt-${CT_MINGWRT_VERSION}-mingw32/configure" \
@@ -120,7 +120,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_SYSROOT_DIR}/include
+ ${CT_HEADERS_DIR}
cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libpdcurses.a
cp pdcurses.a ${CT_SYSROOT_DIR}/lib/libncurses.a
fi
--
For unsubscribe information see http://sourceware.org/lists.html#faq
More information about the crossgcc
mailing list