diff options
| author |  Chris Parsons <cparsons@google.com> | 2016-08-31 17:04:17 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-09-01 08:31:41 +0000 |
| commit | 381850e6be67db046409541dec372d19dbc5f87f (patch) | |
| tree | bc6bdbd339816e25e8def0dd8936bca4b429a57d /scripts/bootstrap | |
| parent | f04849bda4e0bf1e0ce3f091dab9722de72df1a6 (diff) | |
xcode_configure repository rule for determining locally installed versions of xcode to select between, relaxing the requirement that users specify --xcode_version and --ios_sdk_version even if they have only one version installed.
RELNOTES: On mac devices, detect locally installed versions of xcode to:
1. Use a sensible default if xcode is required but --xcode_version is unspecified.
2. Use sensible default iOS SDK version for the targeted version of xcode if ios_sdk_version is unspecified.
--
MOS_MIGRATED_REVID=131841587
Diffstat (limited to 'scripts/bootstrap')
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index bf1da4dd81..1948943e1f 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -254,7 +254,14 @@ chmod 0755 ${ARCHIVE_DIR}/_embedded_binaries/process-wrapper${EXE_EXT} cp src/main/tools/build_interface_so ${ARCHIVE_DIR}/_embedded_binaries/build_interface_so cp src/main/tools/jdk.BUILD ${ARCHIVE_DIR}/_embedded_binaries/jdk.BUILD cp $OUTPUT_DIR/libblaze.jar ${ARCHIVE_DIR} -cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/_embedded_binaries/xcode-locator + +# TODO(b/28965185): Remove when xcode-locator is no longer required in embedded_binaries. +log "Compiling xcode-locator..." +if [[ $PLATFORM == "darwin" ]]; then + run /usr/bin/xcrun clang -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/_embedded_binaries/xcode-locator tools/osx/xcode_locator.m +else + cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/_embedded_binaries/xcode-locator +fi # bazel build using bootstrap version function bootstrap_build() { |