From a6434361097c0ee18c706bf7a86a93324f68e284 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Tue, 15 Sep 2015 13:56:14 +0000 Subject: Parse the label syntax "@//a:b" so that eventually we can make that the syntax that means "refer to the main repository". There isn't an overarching plan for what we are going to do with the cmdline package, which seems to be separated from the .syntax one in all sorts of awkward ways. -- MOS_MIGRATED_REVID=103088960 --- .../devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java') 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 15e91e2c67..22ae3ec0e1 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 @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.analysis.RedirectChaser; 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.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; @@ -32,7 +33,6 @@ import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.packages.Type; import com.google.devtools.build.lib.syntax.Label; -import com.google.devtools.build.lib.syntax.Label.SyntaxException; import com.google.devtools.build.lib.util.Fingerprint; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; @@ -210,7 +210,7 @@ public class CrosstoolConfigurationLoader { return null; } path = env.getPath(containingPackage, CROSSTOOL_CONFIGURATION_FILENAME); - } catch (SyntaxException e) { + } catch (LabelSyntaxException e) { throw new InvalidConfigurationException(e); } catch (NoSuchThingException e) { // Handled later -- cgit v1.2.3