Add recent C++ specific incompatible flags to host

#6942 #6825 #6826 RELNOTES: None. PiperOrigin-RevId: 227491556
bazelbuild · Jan 2, 2019 · 40d1dc9 · 40d1dc9
1 parent 9a18367
commit 40d1dc9
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 20 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -847,6 +847,9 @@ public FragmentOptions getHost() {
     host.doNotUseCpuTransformer = doNotUseCpuTransformer;
     host.enableCcToolchainConfigInfoFromSkylark = enableCcToolchainConfigInfoFromSkylark;
     host.disableGenruleCcToolchainDependency = disableGenruleCcToolchainDependency;
+    host.disableEmittingStaticLibgcc = disableEmittingStaticLibgcc;
+    host.disableDepsetInUserFlags = disableDepsetInUserFlags;
+    host.disableRuntimesFilegroups = disableRuntimesFilegroups;
 
     return host;
   }

diff --git a/tools/cpp/BUILD.empty b/tools/cpp/BUILD.empty
@@ -44,9 +44,7 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
 )
diff --git a/tools/cpp/BUILD.static.freebsd b/tools/cpp/BUILD.static.freebsd
@@ -49,10 +49,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
 )
@@ -80,10 +78,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
 )

diff --git a/tools/cpp/BUILD.static.windows b/tools/cpp/BUILD.static.windows
@@ -52,10 +52,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
 )
@@ -84,10 +82,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 0,
 )
@@ -116,10 +112,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "x64_windows",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
 )
@@ -147,10 +141,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
 )

diff --git a/tools/cpp/BUILD.tpl b/tools/cpp/BUILD.tpl
@@ -63,10 +63,8 @@ cc_toolchain(
     compiler_files = ":compiler_deps",
     cpu = "%{name}",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":compiler_deps",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = %{supports_param_files},
 )
@@ -93,10 +91,8 @@ cc_toolchain(
     compiler_files = ":empty",
     cpu = "local",
     dwp_files = ":empty",
-    dynamic_runtime_libs = [":empty"],
     linker_files = ":empty",
     objcopy_files = ":empty",
-    static_runtime_libs = [":empty"],
     strip_files = ":empty",
     supports_param_files = 1,
 )

diff --git a/tools/osx/crosstool/BUILD.tpl b/tools/osx/crosstool/BUILD.tpl
@@ -66,10 +66,8 @@ cc_toolchain_suite(
         compiler_files = ":osx_tools_" + arch,
         cpu = arch,
         dwp_files = ":empty",
-        dynamic_runtime_libs = [":empty"],
         linker_files = ":osx_tools_" + arch,
         objcopy_files = ":empty",
-        static_runtime_libs = [":empty"],
         strip_files = ":osx_tools_" + arch,
         supports_param_files = 0,
     )