| Tim Windelschmidt | 5d357d8 | 2025-07-10 18:47:15 +0200 | [diff] [blame^] | 1 | diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh |
| 2 | index 1bad14cba7..d312fe08bb 100755 |
| 3 | --- a/scripts/bootstrap/compile.sh |
| 4 | +++ b/scripts/bootstrap/compile.sh |
| 5 | @@ -402,7 +402,7 @@ cp $OUTPUT_DIR/libblaze.jar ${ARCHIVE_DIR} |
| 6 | # TODO(b/28965185): Remove when xcode-locator is no longer required in embedded_binaries. |
| 7 | log "Compiling xcode-locator..." |
| 8 | if [[ $PLATFORM == "darwin" ]]; then |
| 9 | - run /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m |
| 10 | + run @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m |
| 11 | else |
| 12 | cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator |
| 13 | fi |
| 14 | diff --git a/tools/osx/BUILD b/tools/osx/BUILD |
| 15 | index 0358fb0ffe..1e6eae1f33 100644 |
| 16 | --- a/tools/osx/BUILD |
| 17 | +++ b/tools/osx/BUILD |
| 18 | @@ -27,9 +27,9 @@ exports_files([ |
| 19 | ]) |
| 20 | |
| 21 | DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ |
| 22 | - /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \ |
| 23 | - -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \ |
| 24 | - env -i codesign --identifier $@ --force --sign - $@ |
| 25 | + @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \ |
| 26 | + -framework Foundation -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \ |
| 27 | + @usrBinEnv@ @codesign@ --identifier $@ --force --sign - $@ |
| 28 | """ |
| 29 | |
| 30 | genrule( |
| 31 | |