From 933216a11498072ffd029fd6174e709b8c81c3f0 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 12 Jan 2017 20:26:52 +0000 Subject: Have the "version_min" build variable be available to Apple C/C++ compilation actions. -- PiperOrigin-RevId: 144356912 MOS_MIGRATED_REVID=144356912 --- .../devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java | 3 +++ .../devtools/build/lib/rules/objc/ObjcVariablesExtension.java | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'src/main/java/com/google') diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java index 2502b2d9a1..e7e6deb34d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java @@ -40,6 +40,7 @@ public class AppleCcToolchain extends CcToolchain { public static final String SDK_DIR_KEY = "sdk_dir"; public static final String SDK_FRAMEWORK_DIR_KEY = "sdk_framework_dir"; public static final String PLATFORM_DEVELOPER_FRAMEWORK_DIR = "platform_developer_framework_dir"; + public static final String VERSION_MIN_KEY = "version_min"; @VisibleForTesting public static final String XCODE_VERISON_OVERRIDE_VALUE_KEY = "xcode_version_override_value"; @@ -98,6 +99,8 @@ public class AppleCcToolchain extends CcToolchain { .put( APPLE_SDK_PLATFORM_VALUE_KEY, appleEnv.getOrDefault(AppleConfiguration.APPLE_SDK_PLATFORM_ENV_NAME, "")) + .put(VERSION_MIN_KEY, + appleConfiguration.getMinimumOsForPlatformType(platform.getType()).toString()) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java index f8e3802489..38d1a5b631 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcVariablesExtension.java @@ -26,7 +26,6 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; -import com.google.devtools.build.lib.rules.apple.Platform; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.StringSequenceBuilder; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariablesExtension; @@ -37,7 +36,6 @@ class ObjcVariablesExtension implements VariablesExtension { static final String PCH_FILE_VARIABLE_NAME = "pch_file"; static final String FRAMEWORKS_VARIABLE_NAME = "framework_paths"; - static final String VERSION_MIN_VARIABLE_NAME = "version_min"; static final String MODULES_MAPS_DIR_NAME = "module_maps_dir"; static final String OBJC_MODULE_CACHE_DIR_NAME = "_objc_module_cache"; static final String OBJC_MODULE_CACHE_KEY = "modules_cache_path"; @@ -106,7 +104,6 @@ class ObjcVariablesExtension implements VariablesExtension { public void addVariables(CcToolchainFeatures.Variables.Builder builder) { addPchVariables(builder); addFrameworkVariables(builder); - addArchVariables(builder); addModuleMapVariables(builder); if (activeVariableCategories.contains(VariableCategory.ARCHIVE_VARIABLES)) { addArchiveVariables(builder); @@ -150,13 +147,6 @@ class ObjcVariablesExtension implements VariablesExtension { buildConfiguration.getGenfilesFragment() + "/" + OBJC_MODULE_CACHE_DIR_NAME); } - private void addArchVariables(CcToolchainFeatures.Variables.Builder builder) { - Platform platform = appleConfiguration.getSingleArchPlatform(); - builder.addStringVariable( - VERSION_MIN_VARIABLE_NAME, - appleConfiguration.getMinimumOsForPlatformType(platform.getType()).toString()); - } - private void addArchiveVariables(CcToolchainFeatures.Variables.Builder builder) { builder.addStringVariable( OBJ_LIST_PATH_VARIABLE_NAME, -- cgit v1.2.3