From 8608ee97dae0537ee407b007b44f395a3351af83 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 19 Nov 2021 22:56:15 +0000 Subject: [PATCH] Change sysroot flags --- toolchain/BUILD | 4 ++-- toolchain/cc_toolchain_config.bzl | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/toolchain/BUILD b/toolchain/BUILD index a33603a5f7..2b0a815091 100644 --- a/toolchain/BUILD +++ b/toolchain/BUILD @@ -113,7 +113,7 @@ cc_toolchain_config( "-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include" ], linker_path = "/usr/tools", - sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include", + sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx", target_cpu = "aarch64", target_full_name = "aarch64-apple-macosx11.3", toolchain_dir = "/usr/tools/apple_sdks/xcode_13_0/macosx", @@ -129,7 +129,7 @@ cc_toolchain_config( "-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include" ], linker_path = "/usr/tools", - sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include", + sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx", target_cpu = "x86_64", target_full_name = "x86_64-apple-macosx11.3", toolchain_dir = "/usr/tools/apple_sdks/xcode_13_0/macosx", diff --git a/toolchain/cc_toolchain_config.bzl b/toolchain/cc_toolchain_config.bzl index 27185c7a63..1c0e33025d 100644 --- a/toolchain/cc_toolchain_config.bzl +++ b/toolchain/cc_toolchain_config.bzl @@ -109,16 +109,6 @@ def _impl(ctx): ), ], ), - flag_set( - actions = all_compile_actions, - flag_groups = [ - flag_group( - flags = [ - "-isysroot" + ctx.attr.sysroot, - ], - ), - ], - ), ], )