diff options
| author |  cpeyser <cpeyser@google.com> | 2017-11-06 23:10:36 +0100 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-11-07 19:07:02 +0100 |
| commit | a7f8a91e7692be2e1941cb82da486709c228aad7 (patch) | |
| tree | 6256357e5f2bd26496ecff12122e9b4e11fa36bc /src/test/java/com/google/devtools/build/lib/packages/util | |
| parent | 49212e985d41b03d5e8cd4417f773748596587fe (diff) | |
Introduce cc_toolchain_type, which exports c++ make variables. Use
//tools/cpp:toolchain_type as the canonical c++ toolchain.
PiperOrigin-RevId: 174759558
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages/util')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java | 11 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java index f1d52092a3..37356a7385 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java @@ -78,7 +78,7 @@ public final class BazelMockCcSupport extends MockCcSupport { "/bazel_tools_workspace/tools/cpp/BUILD", "package(default_visibility=['//visibility:public'])", "cc_library(name = 'stl')", - "toolchain_type(name = 'toolchain_type')", + "cc_toolchain_type(name = 'toolchain_type')", "cc_library(name = 'malloc')", "cc_toolchain_suite(", " name = 'toolchain',", @@ -156,14 +156,19 @@ public final class BazelMockCcSupport extends MockCcSupport { " name = 'link_dynamic_library',", " srcs = ['link_dynamic_library.sh'],", ")", - "filegroup(name = 'toolchain_category')", "toolchain(", " name = 'toolchain_cc-compiler-piii',", - " toolchain_type = ':toolchain_category',", + " toolchain_type = ':toolchain_type',", " toolchain = '//third_party/crosstool/mock:cc-compiler-piii',", " target_compatible_with = [':mock_value'],", ")", "toolchain(", + " name = 'dummy_cc_toolchain_type',", + " toolchain_type = ':toolchain_type',", + " toolchain = ':dummy_cc_toolchain_impl',", + ")", + "filegroup(name = 'toolchain_category')", + "toolchain(", " name = 'dummy_cc_toolchain',", " toolchain_type = ':toolchain_category',", " toolchain = ':dummy_cc_toolchain_impl',", diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java index 45aa9496b1..c10bb59e59 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java @@ -50,9 +50,7 @@ public class MockPlatformSupport { ")", "toolchain(", " name = 'toolchain_cc-compiler-piii',", - " toolchain_type = '" - + TestConstants.TOOLS_REPOSITORY - + "//tools/cpp:toolchain_category',", + " toolchain_type = '" + TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type',", " toolchain = '" + crosstoolLabel.getRelative("cc-compiler-piii") + "',", " target_compatible_with = [':mock_value'],", ")"); |