diff options
author | Ulf Adams <ulfjack@google.com> | 2016-03-31 07:37:39 +0000 |
---|---|---|
committer | Lukacs Berki <lberki@google.com> | 2016-03-31 11:44:39 +0000 |
commit | c671350661634a8958e4441aaf666a7edb89fd2e (patch) | |
tree | f343c0e660d87a8ef502c6789af4cb5b896bfa55 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 877ec1e39db6810b4206ef75834c243e7816f575 (diff) |
Enable the configuration sanity check for a subset of tests.
Also remove a try-catch block, which was converting all configuration
creation errors to IllegalStateException.
This uncovered a bug in CppOptions, which wasn't adding host_grte_top to the
set of explicit labels.
--
MOS_MIGRATED_REVID=118654358
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index cf8e882dda..7e9bb2a4dc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -647,6 +647,12 @@ public class CppOptions extends FragmentOptions { labelMap.put("crosstool", libcLabel); } } + if (hostLibcTop != null) { + Label libcLabel = hostLibcTop.getLabel(); + if (libcLabel != null) { + labelMap.put("crosstool", libcLabel); + } + } addOptionalLabel(labelMap, "fdo", fdoOptimize); if (stl != null) { |