diff options
| author | Bryan Hundven <bryanhundven@gmail.com> | 2015-04-14 08:18:05 -0700 |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-04-14 08:18:05 -0700 |
| commit | 0056444ad5fde6366a1b1ba7d8d09453e77d1a92 (patch) | |
| tree | e7e2846c5dccd5d796dc0d613dd848546d06763f | |
| parent | 18175b8d93ca1807236eced0a3389e9b46ecca53 (diff) | |
| parent | 00b68926a8a4575f0064ef0b01fd4a8d21dfb5ab (diff) | |
| download | crosstool-ng-0056444ad5fde6366a1b1ba7d8d09453e77d1a92.tar.gz crosstool-ng-0056444ad5fde6366a1b1ba7d8d09453e77d1a92.tar.bz2 crosstool-ng-0056444ad5fde6366a1b1ba7d8d09453e77d1a92.zip | |
Merge pull request #63 from neftedal/master
Updated script to support mingw versions above major 2
| -rw-r--r-- | scripts/build/libc/mingw.sh | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index 9a89df71..94b77053 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -17,6 +17,13 @@ do_libc_check_config() { : } +do_set_mingw_install_prefix(){ + MINGW_INSTALL_PREFIX=/usr/${CT_TARGET} + if [[ ${CT_WINAPI_VERSION} == 2* ]]; then + MINGW_INSTALL_PREFIX=/usr + fi +} + do_libc_start_files() { local -a sdk_opts @@ -33,11 +40,12 @@ do_libc_start_files() { CT_DoLog EXTRA "Configuring Headers" + do_set_mingw_install_prefix CT_DoExecLog CFG \ "${CT_SRC_DIR}/mingw-w64-v${CT_WINAPI_VERSION}/mingw-w64-headers/configure" \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ - --prefix=/usr \ + --prefix=${MINGW_INSTALL_PREFIX} \ "${sdk_opts[@]}" CT_DoLog EXTRA "Compile Headers" @@ -45,7 +53,7 @@ do_libc_start_files() { CT_DoLog EXTRA "Installing Headers" CT_DoExecLog ALL make install DESTDIR=${CT_SYSROOT_DIR} - + CT_Popd # It seems mingw is strangely set up to look into /mingw instead of @@ -56,16 +64,33 @@ do_libc_start_files() { CT_EndStep } +do_check_mingw_vendor_tuple() +{ + if [[ ${CT_WINAPI_VERSION} == 4* ]]; then + CT_DoStep INFO "Checking vendor tuple configured in crosstool-ng .config" + if [[ ${CT_TARGET_VENDOR} == w64 ]]; then + CT_DoLog EXTRA "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 team." + else + CT_DoLog WARN "WARNING! The tuple '${CT_TARGET_VENDOR}', is not equal to w64 and might break the toolchain! WARNING!" + fi + CT_EndStep + fi +} + do_libc() { + do_check_mingw_vendor_tuple + CT_DoStep INFO "Building mingw-w64 files" CT_DoLog EXTRA "Configuring mingw-w64-crt" CT_mkdir_pushd "${CT_BUILD_DIR}/build-mingw-w64-crt" + do_set_mingw_install_prefix CT_DoExecLog CFG \ "${CT_SRC_DIR}/mingw-w64-v${CT_WINAPI_VERSION}/mingw-w64-crt/configure" \ - --prefix=/usr \ + --with-sysroot=${CT_SYSROOT_DIR} \ + --prefix=${MINGW_INSTALL_PREFIX} \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ |