From 65c0872bdf451992fe2b62c2e308b5cc548212f5 Mon Sep 17 00:00:00 2001 From: hlopko Date: Mon, 24 Jul 2017 12:37:02 +0200 Subject: Handle multiple crosstool features providing the same symbol cleanly It's bad to crash with an exception, let's show proper rule error instead. RELNOTES: None. PiperOrigin-RevId: 162916138 --- .../java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java') 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 48debc1ea7..bf85459dfa 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 @@ -384,7 +384,7 @@ public class CppLinkActionTest extends BuildViewTestCase { output, CppHelper.getToolchainUsingDefaultCcToolchainAttribute(ruleContext), CppHelper.getFdoSupportUsingDefaultCcToolchainAttribute(ruleContext), - new FeatureConfiguration()); + FeatureConfiguration.EMPTY); builder.setLinkType(LinkTargetType.STATIC_LIBRARY); assertThat(builder.canSplitCommandLine()).isTrue(); -- cgit v1.2.3