From b78e537405f98bad1df837233752fab40e02d891 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Mon, 5 Oct 2015 23:28:13 +0000 Subject: Pass IOS_SDK_VERSION_OVERRIDE to environment for darwin actions -- MOS_MIGRATED_REVID=104708978 --- .../google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java | 4 +++- .../com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index d30cc92cdb..e3324cb882 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -48,7 +48,7 @@ public class ObjcCommandLineOptions extends FragmentOptions { } } - // TODO(cparsons): Validate version flag value. + // TODO(bazel-team): Validate version flag value. @Option(name = "xcode_version", defaultValue = "", category = "undocumented", @@ -57,7 +57,9 @@ public class ObjcCommandLineOptions extends FragmentOptions { ) public String xcodeVersion; + // TODO(bazel-team): Validate version flag value. @Option(name = "ios_sdk_version", + // TODO(bazel-team): Make this flag optional, and infer SDKROOT based on executor default. defaultValue = DEFAULT_SDK_VERSION, category = "build", help = "Specifies the version of the iOS SDK to use to build iOS applications." diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java index 57bfa95a72..f414f2ed51 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java @@ -49,6 +49,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { "-Os", "-DNDEBUG=1", "-Wno-unused-variable", "-Winit-self", "-Wno-extra"); private static final String XCODE_VERSION_ENV_NAME = "XCODE_VERSION_OVERRIDE"; + private static final String IOS_SDK_VERSION_ENV_NAME = "IOS_SDK_VERSION_OVERRIDE"; private final String iosSdkVersion; private final String iosMinimumOs; @@ -115,6 +116,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { if (xcodeVersionOverride.isPresent()) { builder.put(XCODE_VERSION_ENV_NAME, xcodeVersionOverride.get()); } + builder.put(IOS_SDK_VERSION_ENV_NAME, iosSdkVersion); return builder.build(); } -- cgit v1.2.3