summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-03-07 16:51:43 (GMT)
committerGitHub <noreply@github.com>2017-03-07 16:51:43 (GMT)
commitbfcc1e112a796a262324270485e5b618f18e2b25 (patch)
tree4a0230fcd37b98812c96eaef08c0716a6655180f /scripts
parent456cccc0a7b4410088ac22b6473dfda94a83bc86 (diff)
parent2ef7d36efbfd7754a862d3840f0ea47ccec2f7df (diff)
Merge pull request #635 from stilor/macos-skip-locales
Skip locales on macos
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/debug/300-gdb.sh5
-rw-r--r--scripts/build/libc/glibc.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index a5ac7f9..b2cb08f 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -102,6 +102,11 @@ do_debug_gdb_build() {
# FIXME: Really, we should be testing for host compiler being clang.
CC_for_gdb+=" -Qunused-arguments"
CXX_for_gdb+=" -Qunused-arguments"
+ # clang detects the line from gettext's _ macro as format string
+ # not being a string literal and produces a lot of warnings - which
+ # ct-ng's logger faithfully relays to user if this happens in the
+ # error() function. Suppress them.
+ cross_extra_config+=( "--enable-build-warnings=,-Wno-format-nonliteral,-Wno-format-security" )
;;
esac
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 5207457..569183a 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -541,7 +541,7 @@ do_libc_locales() {
# To build locales, we'd need to build glibc for the build machine.
# Bail out if the host is not supported.
case "${CT_BUILD}" in
- *-cygwin)
+ *-cygwin|*-darwin*)
CT_DoLog EXTRA "Skipping GNU libc locales: incompatible build machine"
return
;;