From 900202fe4418490abca96afd7ebf2b92268be244 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Tue, 6 Sep 2016 16:00:13 +0000 Subject: Change default apple toolchain from darwin_x86_64 to ios_x86_64. This means that in the absence of "--config=" (or the "--cpu=" and "--ios_cpu=" flags that it indicates), c++ code using //tools/osx/crosstool will default to being built for ios_x86_64 instead of darwin_x86_64. This is necessary to ensure that once the crosstool is used for objc, the default behavior of objc_library building for ios_x86_64 will be maintained. -- MOS_MIGRATED_REVID=132326009 --- compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compile.sh') diff --git a/compile.sh b/compile.sh index 53fc4127b9..f8940e21d3 100755 --- a/compile.sh +++ b/compile.sh @@ -91,7 +91,7 @@ fi if [[ $PLATFORM == "darwin" ]] && \ xcodebuild -showsdks 2> /dev/null | grep -q '\-sdk iphonesimulator'; then - EXTRA_BAZEL_ARGS="${EXTRA_BAZEL_ARGS-} --define IPHONE_SDK=1" + EXTRA_BAZEL_ARGS="${EXTRA_BAZEL_ARGS-} --define IPHONE_SDK=1 --cpu=darwin_x86_64 --ios_cpu=x86_64" fi source scripts/bootstrap/bootstrap.sh -- cgit v1.2.3