Strip Xcode versions like "9.0gm" for the version flag.
Turns out, those exist.
RELNOTES: None.
PiperOrigin-RevId: 172768102
diff --git a/tools/osx/xcode_version_flag.bzl b/tools/osx/xcode_version_flag.bzl
index 5503749..58efa96 100644
--- a/tools/osx/xcode_version_flag.bzl
+++ b/tools/osx/xcode_version_flag.bzl
@@ -14,48 +14,74 @@
"""Rules that allows select() to differentiate between Apple OS versions."""
+def _strip_version(version):
+ """Strip trailing characters from version names.
+
+ Some OS versions look like "9.0gm", which is not useful for select()
+ statements. Thus, we strip the trailing "gm" part.
+
+ Args:
+ version: the version string
+
+ Returns:
+ The version with trailing letters stripped.
+ """
+ result = ""
+ for ch in str(version):
+ if not ch.isdigit() and ch != ".":
+ break
+
+ result += ch
+
+ return result
+
+
def _xcode_version_flag_impl(ctx):
"""A rule that allows select() to differentiate between Xcode versions."""
xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]
-
return struct(providers = [
- config_common.FeatureFlagInfo(value = str(xcode_config.xcode_version()))])
+ config_common.FeatureFlagInfo(value = _strip_version(
+ xcode_config.xcode_version()))])
def _ios_sdk_version_flag_impl(ctx):
"""A rule that allows select() to select based on the iOS SDK version."""
xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]
- return struct(providers = [config_common.FeatureFlagInfo(value = str(
- xcode_config.sdk_version_for_platform(
- apple_common.platform.ios_device)))])
+ return struct(providers = [
+ config_common.FeatureFlagInfo(value = _strip_version(
+ xcode_config.sdk_version_for_platform(
+ apple_common.platform.ios_device)))])
def _tvos_sdk_version_flag_impl(ctx):
"""A rule that allows select() to select based on the tvOS SDK version."""
xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]
- return struct(providers = [config_common.FeatureFlagInfo(value = str(
- xcode_config.sdk_version_for_platform(
- apple_common.platform.tvos_device)))])
+ return struct(providers = [
+ config_common.FeatureFlagInfo(value = _strip_version(
+ xcode_config.sdk_version_for_platform(
+ apple_common.platform.tvos_device)))])
def _watchos_sdk_version_flag_impl(ctx):
"""A rule that allows select() to select based on the watchOS SDK version."""
xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]
- return struct(providers = [config_common.FeatureFlagInfo(value = str(
- xcode_config.sdk_version_for_platform(
- apple_common.platform.watchos_device)))])
+ return struct(providers = [
+ config_common.FeatureFlagInfo(value = _strip_version(
+ xcode_config.sdk_version_for_platform(
+ apple_common.platform.watchos_device)))])
def _macos_sdk_version_flag_impl(ctx):
"""A rule that allows select() to select based on the macOS SDK version."""
xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig]
- return struct(providers = [config_common.FeatureFlagInfo(value = str(
- xcode_config.sdk_version_for_platform(
- apple_common.platform.macos_device)))])
+ return struct(providers = [
+ config_common.FeatureFlagInfo(value = _strip_version(
+ xcode_config.sdk_version_for_platform(
+ apple_common.platform.macos_device)))])
xcode_version_flag = rule(
