Skip to content

Commit

Permalink
Bump minimum supported macOS versions to 10.13
Browse files Browse the repository at this point in the history
As per https://developer.apple.com/support/xcode/ Xcode from 14.0 no longer supports targeting 10.9, and attempting to do so may fail in obscure ways.

10.13 is still 5+ years old, so we retain coverage for a reasonable range on macOS versions.

Closes #17451.

PiperOrigin-RevId: 511577111
Change-Id: I770ff101f52d16f2fc402f054579740b650986cc
  • Loading branch information
illicitonion authored and copybara-github committed Feb 22, 2023
1 parent e218924 commit 43dadb2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion scripts/bootstrap/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ cp $OUTPUT_DIR/libblaze.jar ${ARCHIVE_DIR}
# 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 --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m
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
else
cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator
fi
Expand Down
4 changes: 2 additions & 2 deletions tools/cpp/osx_cc_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def _compile_cc_file_single_arch(repository_ctx, src_name, out_name, timeout):
"--sdk",
"macosx",
"clang",
"-mmacosx-version-min=10.9",
"-mmacosx-version-min=10.13",
"-std=c++11",
"-lc++",
"-O3",
Expand Down Expand Up @@ -98,7 +98,7 @@ def _compile_cc_file(repository_ctx, src_name, out_name, timeout):
"--sdk",
"macosx",
"clang",
"-mmacosx-version-min=10.9",
"-mmacosx-version-min=10.13",
"-std=c++11",
"-lc++",
"-arch",
Expand Down
2 changes: 1 addition & 1 deletion tools/osx/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports_files([
])

DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
/usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
/usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
-framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
env -i codesign --identifier $@ --force --sign - $@
"""
Expand Down
2 changes: 1 addition & 1 deletion tools/osx/xcode_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
"--sdk",
"macosx",
"clang",
"-mmacosx-version-min=10.9",
"-mmacosx-version-min=10.13",
"-fobjc-arc",
"-framework",
"CoreServices",
Expand Down

0 comments on commit 43dadb2

Please sign in to comment.