diff options
Diffstat (limited to 'src/main')
3 files changed, 1 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java index e2d29fc3ec..811ec110d1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java @@ -762,8 +762,6 @@ public class CcToolchain implements RuleConfiguredTargetFactory { return CrosstoolConfigurationLoader.selectToolchain( cppConfiguration.getCrosstoolFile().getProto(), config, - cppConfiguration.getLipoMode(), - cppConfiguration.shouldConvertLipoToThinLto(), cppConfiguration.getCpuTransformer()); } catch (InvalidConfigurationException e) { ruleContext.throwWithRuleError( 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 a475aeb1a2..ea462653ab 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 @@ -39,7 +39,6 @@ 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; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CrosstoolRelease; -import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.LipoMode; import com.google.protobuf.TextFormat; import com.google.protobuf.TextFormat.ParseException; import com.google.protobuf.UninitializedMessageException; @@ -295,9 +294,7 @@ public class CrosstoolConfigurationLoader { throws InvalidConfigurationException { CrosstoolConfigurationIdentifier config = CrosstoolConfigurationIdentifier.fromOptions(options); - CppOptions cppOptions = options.get(CppOptions.class); - return selectToolchain( - release, config, cppOptions.getLipoMode(), cppOptions.convertLipoToThinLto, cpuTransformer); + return selectToolchain(release, config, cpuTransformer); } /** @@ -314,8 +311,6 @@ public class CrosstoolConfigurationLoader { public static CrosstoolConfig.CToolchain selectToolchain( CrosstoolConfig.CrosstoolRelease release, CrosstoolConfigurationIdentifier config, - LipoMode lipoMode, - boolean convertLipoToThinLto, Function<String, String> cpuTransformer) throws InvalidConfigurationException { if (config.getCompiler() != null) { @@ -350,11 +345,7 @@ public class CrosstoolConfigurationLoader { // We use fake CPU values to allow cross-platform builds for other languages that use the // C++ toolchain. Translate to the actual target architecture. String desiredCpu = cpuTransformer.apply(config.getCpu()); - boolean needsLipo = lipoMode != LipoMode.OFF && !convertLipoToThinLto; for (CrosstoolConfig.DefaultCpuToolchain selector : release.getDefaultToolchainList()) { - if (needsLipo && !selector.getSupportsLipo()) { - continue; - } if (selector.getCpu().equals(desiredCpu)) { selectedIdentifier = selector.getToolchainIdentifier(); break; diff --git a/src/main/protobuf/crosstool_config.proto b/src/main/protobuf/crosstool_config.proto index 3ad7c7a0e1..0b0716782e 100644 --- a/src/main/protobuf/crosstool_config.proto +++ b/src/main/protobuf/crosstool_config.proto @@ -523,7 +523,6 @@ message MakeVariable { message DefaultCpuToolchain { required string cpu = 1; required string toolchain_identifier = 2; - optional bool supports_lipo = 3 [default = true]; } // An entire crosstool release, containing the version number, a default target |