aboutsummaryrefslogtreecommitdiff
path: root/scripts/build/libc/mingw-w64.sh
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2022-02-14 00:11:42 -0800
committerGitHub <noreply@github.com>2022-02-14 00:11:42 -0800
commit681aaef1f1ff39c341fdc529e0db2c14639a58d8 (patch)
treece98c2b3d9648db065d27add325370392a35d584 /scripts/build/libc/mingw-w64.sh
parentba680a3e5b8c62a7c1554e71f6d09903dac95a2f (diff)
parent86c2982568de1ad4d4cc12a65b19231331484405 (diff)
downloadcrosstool-ng-681aaef1f1ff39c341fdc529e0db2c14639a58d8.tar.gz
crosstool-ng-681aaef1f1ff39c341fdc529e0db2c14639a58d8.tar.bz2
crosstool-ng-681aaef1f1ff39c341fdc529e0db2c14639a58d8.zip
Merge pull request #1674 from stilor/master
Updates to make `ct-ng build-all` pass
Diffstat (limited to 'scripts/build/libc/mingw-w64.sh')
-rw-r--r--scripts/build/libc/mingw-w64.sh18
1 files changed, 8 insertions, 10 deletions
diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh
index 683f8be9..54e8d07c 100644
--- a/scripts/build/libc/mingw-w64.sh
+++ b/scripts/build/libc/mingw-w64.sh
@@ -9,7 +9,7 @@ mingw_w64_set_install_prefix()
fi
}
-mingw_w64_start_files() {
+mingw_w64_headers() {
local -a sdk_opts
CT_DoStep INFO "Installing C library headers"
@@ -56,15 +56,13 @@ mingw_w64_start_files() {
do_check_mingw_vendor_tuple()
{
- if [ "${CT_MINGW_W64_REQUIRES_W64_VENDOR}" = "y" ]; then
- CT_DoStep INFO "Checking configured vendor tuple"
- if [ ${CT_TARGET_VENDOR} = "w64" ]; then
- CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
- else
- CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
- fi
- CT_EndStep
- fi
+ CT_DoStep INFO "Checking configured vendor tuple"
+ if [ ${CT_TARGET_VENDOR} = "w64" ]; then
+ CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
+ else
+ CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
+ fi
+ CT_EndStep
}
do_mingw_tools()