diff options
| author |  Chris Parsons <cparsons@google.com> | 2016-01-08 00:42:14 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-08 07:27:44 +0000 |
| commit | f488818ce168dca4760944d1378b00b9fe74d4d6 (patch) | |
| tree | a3d20c6d8a15c45d6820a7fac67a07d7472be260 /scripts | |
| parent | bf98f39d5d69d14d74dad79e705f76966f348766 (diff) | |
Add xcode_locator to bazel's embedded binaries.
For bazel on non-darwin architectures, this will simply be a stub, and should never be invoked. On darwin arcitectures, the tool will map xcode version to xcode path on the host system.
--
MOS_MIGRATED_REVID=111651147
Diffstat (limited to 'scripts')
| -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 abb03cee98..d023da7ce7 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -331,6 +331,13 @@ run_silent "${CXX}" -o ${OUTPUT_DIR}/build-runfiles -std=c++0x src/main/tools/bu log "Compiling process-wrapper..." run_silent "${CC}" -o ${OUTPUT_DIR}/process-wrapper -std=c99 src/main/tools/process-wrapper.c src/main/tools/process-tools.c -lm ${LDFLAGS} +log "Compiling xcode-locator..." +if [[ $PLATFORM == "darwin" ]]; then + run_silent /usr/bin/xcrun clang -fobjc-arc -framework CoreServices -framework Foundation -o ${OUTPUT_DIR}/xcode-locator src/main/tools/xcode_locator.m +else + cp src/main/tools/xcode_locator_stub.sh ${OUTPUT_DIR}/xcode-locator +fi + log "Compiling namespace-sandbox..." if [[ $PLATFORM == "linux" ]]; then run_silent "${CC}" -o ${OUTPUT_DIR}/namespace-sandbox -std=c99 src/main/tools/namespace-sandbox.c src/main/tools/network-tools.c src/main/tools/process-tools.c -lm ${LDFLAGS} @@ -343,7 +350,7 @@ cp src/main/tools/jdk.* ${OUTPUT_DIR} log "Creating Bazel self-extracting archive..." ARCHIVE_DIR=${OUTPUT_DIR}/archive -for i in libblaze.jar ${JNILIB} build-runfiles${EXE_EXT} process-wrapper${EXE_EXT} namespace-sandbox${EXE_EXT} build_interface_so ${MSYS_DLLS} jdk.BUILD; do +for i in libblaze.jar ${JNILIB} build-runfiles${EXE_EXT} process-wrapper${EXE_EXT} xcode-locator${EXE_EXT} namespace-sandbox${EXE_EXT} build_interface_so ${MSYS_DLLS} jdk.BUILD; do mkdir -p $(dirname $ARCHIVE_DIR/$i); cp $OUTPUT_DIR/$i $ARCHIVE_DIR/$i; done |