diff options
| author |  hlopko <hlopko@google.com> | 2017-04-13 10:53:52 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-04-13 16:52:38 +0200 |
| commit | 045104899738594d85f9ab9b0b9ccbde320b8055 (patch) | |
| tree | a13037d9bade6bc128da6aff5b2d6338cc1b6f13 /src/test/java/com | |
| parent | d90737372d370d920e390aff6138dbc2aec2f3b1 (diff) | |
Make C++ archiving use action_configs instead of hardcoded flags
RELNOTES: Use action_config in crosstool for static library archiving, remove ar_flag.
PiperOrigin-RevId: 153046587
Diffstat (limited to 'src/test/java/com')
3 files changed, 1 insertions, 13 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL index 1d9789e84a..f98f897979 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL @@ -298,9 +298,6 @@ toolchain { builtin_sysroot: "" cxx_flag: "-std=c++0x" - ar_flag: "-static" - ar_flag: "-s" - ar_flag: "-o" linker_flag: "-lstdc++" cxx_builtin_include_directory: "/usr/include" cxx_builtin_include_directory: "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain" @@ -341,9 +338,6 @@ toolchain { builtin_sysroot: "" cxx_flag: "-std=c++0x" - ar_flag: "-static" - ar_flag: "-s" - ar_flag: "-o" linker_flag: "-lstdc++" cxx_builtin_include_directory: "/usr/include" cxx_builtin_include_directory: "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain" @@ -387,9 +381,6 @@ toolchain { builtin_sysroot: "" cxx_flag: "-std=c++0x" - ar_flag: "-static" - ar_flag: "-s" - ar_flag: "-o" linker_flag: "-lstdc++" cxx_builtin_include_directory: "/usr/include" cxx_builtin_include_directory: "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain" diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 1b38da18d5..e5b39ab0fe 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -88,6 +88,7 @@ public class CppLinkActionTest extends BuildViewTestCase { ImmutableSet.<String>of(), "gcc_tool", "dynamic_library_linker_tool", + "ar_tool", true)) .getFeatureConfiguration( Link.LinkTargetType.EXECUTABLE.getActionName(), diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index cff877e2f0..43e2a1c3be 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -223,7 +223,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertEquals(Arrays.asList("objcopy"), toolchain.getObjCopyOptionsForEmbedding()); assertEquals(Arrays.<String>asList(), toolchain.getLdOptionsForEmbedding()); - assertEquals(Arrays.asList("rcsD"), toolchain.getArFlags()); assertThat(toolchain.getAdditionalMakeVariables().entrySet()) .containsExactlyElementsIn( @@ -297,7 +296,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " objcopy_embed_flag: \"objcopy-embed-flag-A-2\"\n" + " ld_embed_flag: \"ld-embed-flag-A-1\"\n" + " ld_embed_flag: \"ld-embed-flag-A-2\"\n" - + " ar_flag : \"ar-flag-A\"\n" + " compilation_mode_flags {\n" + " mode: FASTBUILD\n" + " compiler_flag: \"fastbuild-flag-A-1\"\n" @@ -389,7 +387,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " objcopy_embed_flag: \"objcopy-embed-flag-B-2\"\n" + " ld_embed_flag: \"ld-embed-flag-B-1\"\n" + " ld_embed_flag: \"ld-embed-flag-B-2\"\n" - + " ar_flag : \"ar-flag-B\"\n" + " compilation_mode_flags {\n" + " mode: FASTBUILD\n" + " compiler_flag: \"fastbuild-flag-B-1\"\n" @@ -582,7 +579,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertEquals( Arrays.asList("ld-embed-flag-A-1", "ld-embed-flag-A-2"), toolchainA.getLdOptionsForEmbedding()); - assertEquals(Arrays.asList("ar-flag-A"), toolchainA.getArFlags()); assertThat(toolchainA.getAdditionalMakeVariables().entrySet()) .containsExactlyElementsIn( |