Merge pull request #9524 from protocolbuffers/sysroot

Change sysroot flags
3 years ago · ddfc233f57
parent 2f7ee91e32 cf05c9f84f
commit ddfc233f57
1 changed files with 6 additions and 1 deletions
--- a/toolchain/cc_toolchain_config.bzl
+++ b/toolchain/cc_toolchain_config.bzl
@ -102,13 +102,18 @@ def _impl(ctx):
      ],
  )

+  if 'osx' in ctx.attr.target_full_name:
+    sysroot_action_set = all_link_actions
+  else:
+    sysroot_action_set = all_link_actions + all_compile_actions
+
  sysroot_flags = feature(
      name = "sysroot_flags",
      #Only enable this if a sysroot was specified
      enabled = (ctx.attr.sysroot != ""),
      flag_sets = [
          flag_set(
-              actions = all_link_actions + all_compile_actions,
+              actions = sysroot_action_set,
              flag_groups = [
                  flag_group(
                      flags = [