Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.4.1]Bump minimum supported macOS versions to 10.13 #17977

Merged
merged 4 commits into from
Apr 5, 2023
Merged

[5.4.1]Bump minimum supported macOS versions to 10.13 #17977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d92b22e
Bump minimum supported macOS versions to 10.13
illicitonion Feb 22, 2023
8d30015
Update BUILD.bazel
keertk Apr 4, 2023
8012dc4
Revert change
keertk Apr 4, 2023
49bd15e
Merge branch 'release-5.4.1' into ks/cherry-pick17451
ShreeM01 Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/bootstrap/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def _compile_cc_file_single_arch(repository_ctx, src_name, out_name):
"--sdk",
"macosx",
"clang",
"-mmacosx-version-min=10.9",
"-mmacosx-version-min=10.13",
"-std=c++11",
"-lc++",
"-O3",
Expand Down Expand Up @@ -94,7 +94,7 @@ def _compile_cc_file(repository_ctx, src_name, out_name):
"--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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,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