diff options
| author |  Cal Peyser <cpeyser@google.com> | 2016-09-06 16:00:13 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-09-07 10:33:46 +0000 |
| commit | 900202fe4418490abca96afd7ebf2b92268be244 (patch) | |
| tree | 1dbc3169104ac5f7a1b7b971de2d531f06c524e6 /compile.sh | |
| parent | 180d1b56b8aea8fab974cfa57e9182598990710c (diff) | |
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
Diffstat (limited to 'compile.sh')
| -rwxr-xr-x | compile.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |