Skip to content

Commit b0ff8f6

Browse files
committed
Remove acosx-version-min
While this was part of our original patch, it really only helps give warning messages for sysroot version mismatches. Remove for now since its not really important to the core logic of the change.
1 parent 77e5d66 commit b0ff8f6

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

toolchain/cc_toolchain_config.bzl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,7 @@ def cc_toolchain_config(
174174

175175
ld = "ld64.lld"
176176
ld_path = toolchain_path_prefix + "/bin/" + ld
177-
compile_flags.append("-mmacosx-version-min=12.0")
178177
link_flags.extend([
179-
"-mmacosx-version-min=12.0",
180-
"-Wl,-platform_version,macos,12.0,12.0",
181178
"--ld-path=" + ld_path,
182179
"-headerpad_max_install_names",
183180
"-fobjc-link-runtime",
@@ -236,10 +233,6 @@ def cc_toolchain_config(
236233
if use_lld:
237234
# For single-platform builds, we can statically link the bundled
238235
# libraries.
239-
link_flags.extend([
240-
"-l:libc++.a",
241-
"-l:libc++abi.a",
242-
])
243236
compiler_rt_link_flags = ["-rtlib=compiler-rt"]
244237
libunwind_link_flags = [
245238
"-l:libunwind.a",
@@ -291,9 +284,6 @@ def cc_toolchain_config(
291284
"-stdlib=libstdc++",
292285
]
293286

294-
link_flags.extend([
295-
"-l:libstdc++.a",
296-
])
297287
elif stdlib == "libc":
298288
cxx_flags = [
299289
"-std=" + cxx_standard,

0 commit comments

Comments
 (0)