Skip to content

Commit

Permalink
Change default apple toolchain from darwin_x86_64 to ios_x86_64.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
calpeyser authored and hermione521 committed Sep 7, 2016
1 parent 180d1b5 commit 900202f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 900202f

Please sign in to comment.