Merge pull request #69 from Yexo:master
PiperOrigin-RevId: 307024012
Change-Id: I40dd8d6310437099dd90fb7beec854696c67a561
diff --git a/cc/private/toolchain/BUILD b/cc/private/toolchain/BUILD
index 70280af..3026ac6 100644
--- a/cc/private/toolchain/BUILD
+++ b/cc/private/toolchain/BUILD
@@ -65,19 +65,6 @@
srcs = [],
)
-# This is the entry point for --crosstool_top. Toolchains are found
-# by lopping off the name of --crosstool_top and searching for
-# "cc-compiler-${CPU}" in this BUILD file, where CPU is the target CPU
-# specified in --cpu.
-#
-# This file group should include
-# * all cc_toolchain targets supported
-# * all file groups that said cc_toolchain might refer to
-alias(
- name = "toolchain",
- actual = "//external:cc_toolchain",
-)
-
filegroup(
name = "srcs",
srcs = glob(["**"]),
diff --git a/cc/private/toolchain/unix_cc_toolchain_config.bzl b/cc/private/toolchain/unix_cc_toolchain_config.bzl
index 3d5ae2f..c3cf3ba 100644
--- a/cc/private/toolchain/unix_cc_toolchain_config.bzl
+++ b/cc/private/toolchain/unix_cc_toolchain_config.bzl
@@ -354,8 +354,8 @@
flag_group(
flags = [
"-fprofile-use=%{fdo_profile_path}",
- "-Xclang-only=-Wno-profile-instr-unprofiled",
- "-Xclang-only=-Wno-profile-instr-out-of-date",
+ "-Wno-profile-instr-unprofiled",
+ "-Wno-profile-instr-out-of-date",
"-fprofile-correction",
],
expand_if_available = "fdo_profile_path",
@@ -808,8 +808,8 @@
flag_groups = [
flag_group(
flags = [
- "-Xclang-only=-mllvm",
- "-Xclang-only=-prefetch-hints-file=%{fdo_prefetch_hints_path}",
+ "-mllvm",
+ "-prefetch-hints-file=%{fdo_prefetch_hints_path}",
],
expand_if_available = "fdo_prefetch_hints_path",
),
