diff options
author | 2015-09-15 13:56:14 +0000 | |
---|---|---|
committer | 2015-09-15 20:27:47 +0000 | |
commit | a6434361097c0ee18c706bf7a86a93324f68e284 (patch) | |
tree | 98a3109cb41b1f6cbcb5bae4f9452fdb81553ae4 /src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java | |
parent | 5d737d642623749c8672916548b7c7c85b2ca9e6 (diff) |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java index 2ad010a89a..96b1add119 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; +import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.packages.InputFile; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.NoSuchTargetException; @@ -34,7 +35,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.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig; @@ -153,7 +153,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory { throw new InvalidConfigurationException( "The --fdo_optimize parameter you specified resolves to a file that does not exist"); } - } catch (NoSuchPackageException | NoSuchTargetException | SyntaxException e) { + } catch (NoSuchPackageException | NoSuchTargetException | LabelSyntaxException e) { throw new InvalidConfigurationException(e); } } else { @@ -189,7 +189,7 @@ public class CppConfigurationLoader implements ConfigurationFragmentFactory { } else { try { ccToolchainLabel = crosstoolTopLabel.getRelative("cc-compiler-" + toolchain.getTargetCpu()); - } catch (Label.SyntaxException e) { + } catch (LabelSyntaxException e) { throw new InvalidConfigurationException(String.format( "'%s' is not a valid CPU. It should only consist of characters valid in labels", toolchain.getTargetCpu())); |