diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 77a06d8a02..49887706c3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -2043,9 +2043,7 @@ public class CppConfiguration extends BuildConfiguration.Fragment { // until they're read from the CROSSTOOL. Feed the CROSSTOOL defaults in here. return ImmutableMap.<String, Object>of( "cpu", getTargetCpu(), - "compiler", getCompiler(), - "glibc", getTargetLibc() - ); + "compiler", getCompiler()); } public PathFragment getFdoInstrument() { diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java index 3005c077be..9e93477c19 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java @@ -166,7 +166,6 @@ public class ConfigSettingTest extends BuildViewTestCase { public void testLateBoundOptionDefaults() throws Exception { String crosstoolCpuDefault = (String) getTargetConfiguration().getOptionValue("cpu"); String crosstoolCompilerDefault = (String) getTargetConfiguration().getOptionValue("compiler"); - String crosstoolLibcDefault = (String) getTargetConfiguration().getOptionValue("glibc"); scratch.file("test/BUILD", "config_setting(", @@ -174,7 +173,6 @@ public class ConfigSettingTest extends BuildViewTestCase { " values = {", " 'cpu': '" + crosstoolCpuDefault + "',", " 'compiler': '" + crosstoolCompilerDefault + "',", //'gcc-4.4.0',", - " 'glibc': '" + crosstoolLibcDefault + "',", //'2.3.2',", " })"); assertTrue(getConfigMatchingProvider("//test:match").matches()); @@ -182,8 +180,6 @@ public class ConfigSettingTest extends BuildViewTestCase { assertNotNull(crosstoolCpuDefault); assertNull(flagDefault("compiler")); assertNotNull(crosstoolCompilerDefault); - assertNull(flagDefault("glibc")); - assertNotNull(crosstoolLibcDefault); } /** |