diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-08-17 00:54:14 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-08-17 00:54:14 (GMT) |
| commit | 73e8b0b228e29f6cac1b186cbcb7e3d1a47711ac (patch) | |
| tree | 05b70b3bcb19098ccec1c7a95af5a3cdcf4eaebd /scripts | |
| parent | f555602f6622eaf45bab6b28101eb2e5ba44bc7b (diff) | |
| parent | 9b076a39abf04442245738bf434cc35a85f502ca (diff) | |
Merge pull request #801 from stilor/regressions
Regressions
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/libc/mingw-w64.sh | 6 | ||||
| -rw-r--r-- | scripts/functions | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh index 295b313..21afb29 100644 --- a/scripts/build/libc/mingw-w64.sh +++ b/scripts/build/libc/mingw-w64.sh @@ -63,10 +63,10 @@ do_libc_start_files() { do_check_mingw_vendor_tuple() { - if [ "${CT_MINGW_W64_VERSION%%.*}" -ge 4 ]; then + if [ "${CT_MINGW_W64_REQUIRES_W64_VENDOR}" = "y" ]; then CT_DoStep INFO "Checking configured vendor tuple" - if [ ${CT_TARGET_VENDOR} == w64 ]; then - CT_DoLog EXTRA "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers." + 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 diff --git a/scripts/functions b/scripts/functions index 6ce53b0..ed8eb67 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1961,7 +1961,7 @@ CT_DoExtractPatch() local overlay if [ ! -d "${CT_BUILD_DIR}/overlay" ]; then - CT_DoLog ALL mkdir -p "${CT_BUILD_DIR}/overlay" + CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}/overlay" overlay="${CT_OVERLAY_LOCATION}/${CT_ARCH}_${CT_OVERLAY_NAME:-overlay}" ext=`CT_GetFileExtension "${overlay}"` if [ ! -r "${overlay}${ext}" ]; then |