diff options
| author |  rosica <rosica@google.com> | 2018-06-04 10:41:53 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-04 10:43:50 -0700 |
| commit | 25ae199041c4176d06bbe36ff112da28c2a48a15 (patch) | |
| tree | 9c8c6df451ef26102091f792c465c44ae755f342 /src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java | |
| parent | 9cf0f655dc0e416f88c64bebe0eed6f1536b33fd (diff) | |
Remove --glibc option
Crosstool selection will be based solely on --cpu and --compiler options.
RELNOTES: Option --glibc is removed, toolchain selection relies solely on --cpu and --compiler options.
PiperOrigin-RevId: 199156131
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoader.java | 4 |
1 files changed, 3 insertions, 1 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 c1429e1985..caed2d37b6 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 @@ -317,7 +317,7 @@ public class CrosstoolConfigurationLoader { boolean convertLipoToThinLto, Function<String, String> cpuTransformer) throws InvalidConfigurationException { - if ((config.getCompiler() != null) || (config.getLibc() != null)) { + if (config.getCompiler() != null) { ArrayList<CrosstoolConfig.CToolchain> candidateToolchains = new ArrayList<>(); for (CrosstoolConfig.CToolchain toolchain : release.getToolchainList()) { if (config.isCandidateToolchain(toolchain)) { @@ -396,6 +396,8 @@ public class CrosstoolConfigurationLoader { message.append("[\n"); for (CrosstoolConfig.CToolchain toolchain : toolchains) { message.append(" "); + message.append(toolchain.getToolchainIdentifier()); + message.append(": "); message.append( CrosstoolConfigurationIdentifier.fromToolchain(toolchain).describeFlags().trim()); message.append(",\n"); |