Fix CrosstoolConfigurationLoader to not assume the presense of a BUILD

file.

Change-Id: I5b66b91f016e12e546600f585546fc56d9511303
PiperOrigin-RevId: 184698749

1 files changed, 1 insertions, 5 deletions

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 7244b7f3dc..07e722a0d7 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
@@ -26,7 +26,6 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.packages.NoSuchThingException;
 import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper;
 import com.google.devtools.build.lib.packages.Package;
@@ -208,14 +207,11 @@ public class CrosstoolConfigurationLoader {
       throws IOException, InvalidConfigurationException, InterruptedException {
     final Path path;
     try {
-      Package containingPackage = env.getTarget(crosstoolTop.getLocalTargetLabel("BUILD"))
-          .getPackage();
+      Package containingPackage = env.getTarget(crosstoolTop).getPackage();
       if (containingPackage == null) {
         return null;
       }
       path = env.getPath(containingPackage, CROSSTOOL_CONFIGURATION_FILENAME);
-    } catch (LabelSyntaxException e) {
-      throw new InvalidConfigurationException(e);
     } catch (NoSuchThingException e) {
       // Handled later
       return null;