macos: make --config=remote work again (#5680)

buildbuddy-io · Jan 10, 2024 · f10453d · f10453d
1 parent ee5d26f
commit f10453d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -203,8 +203,9 @@ common:windows --cxxopt=/std:c++17
 # This is currently not avoidable with the current way the local cc toolchain is configured
 # as well as how linkopts are propagated through the dependency graph between libraries.
 # This flag is a workaround to silence the linker warnings.
-common:macos --linkopt="-Wl,-no_warn_duplicate_libraries"
-common:macos --host_linkopt="-Wl,-no_warn_duplicate_libraries"
+# common:macos --linkopt="-Wl,-no_warn_duplicate_libraries"
+# common:macos --host_linkopt="-Wl,-no_warn_duplicate_libraries"
+common:macos --platform_mappings=platform_mapping
 
 # Ensure that we don't use the apple_support cc_toolchain
 common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1

diff --git a/platform_mapping b/platform_mapping
@@ -0,0 +1,4 @@
+platforms:
+  @local_config_platform//:host
+    --linkopt="-Wl,-no_warn_duplicate_libraries"
+    --host_linkopt="-Wl,-no_warn_duplicate_libraries"