diff options
5 files changed, 17 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationIdentifier.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationIdentifier.java index 02028d10e2..accd29c195 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationIdentifier.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationIdentifier.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.rules.cpp; +import com.google.common.base.Preconditions; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Options; import com.google.devtools.build.lib.analysis.config.BuildOptions; @@ -39,7 +40,7 @@ public final class CrosstoolConfigurationIdentifier implements CrosstoolConfigur /** Creates a new {@link CrosstoolConfigurationIdentifier} with the given parameters. */ CrosstoolConfigurationIdentifier(String cpu, String compiler, String libc) { - this.cpu = cpu; + this.cpu = Preconditions.checkNotNull(cpu); this.compiler = compiler; this.libc = libc; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java index c712b186fd..aa12a860c3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java @@ -368,8 +368,11 @@ public class CrosstoolConfigurationLoader { cpuBuilder.append(" ").append(selector.getCpu()).append(",\n"); } throw new InvalidConfigurationException( - "No toolchain found for cpu '" + desiredCpu - + "'. Valid cpus are: [\n" + cpuBuilder + "]"); + "No default_toolchain found for cpu '" + + desiredCpu + + "'. Valid cpus are: [\n" + + cpuBuilder + + "]"); } checkToolChain(selectedIdentifier, desiredCpu); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationOptions.java index 16a05777a4..46af308d23 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationOptions.java @@ -14,16 +14,20 @@ package com.google.devtools.build.lib.rules.cpp; +import javax.annotation.Nullable; + /** * A container object which provides crosstool configuration options to the build. */ public interface CrosstoolConfigurationOptions { /** Returns the CPU associated with this crosstool configuration. */ - public String getCpu(); + String getCpu(); /** Returns the compiler associated with this crosstool configuration. */ - public String getCompiler(); + @Nullable + String getCompiler(); /** Returns the libc version associated with this crosstool configuration. */ - public String getLibc(); + @Nullable + String getLibc(); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java index abda893c45..0e6051a929 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java @@ -146,7 +146,8 @@ public class BuildConfigurationTest extends ConfigurationTestCase { .hasMessageThat() .matches( Pattern.compile( - "No toolchain found for cpu 'bogus'. Valid cpus are: \\[\n( [\\w-]+,\n)+]")); + "No default_toolchain found for cpu 'bogus'. " + + "Valid cpus are: \\[\n( [\\w-]+,\n)+]")); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index 8845f56714..54808d2665 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -118,7 +118,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { expectThrows(AssertionError.class, () -> getConfiguredTarget("//test/skylark:test")); assertThat(noToolchainError) .hasMessageThat() - .contains("No toolchain found for cpu 'doesnotexist'"); + .contains("No default_toolchain found for cpu 'doesnotexist'"); } @Test |