From 6bd0bdf5140525cb33dc2db068b210261d9df271 Mon Sep 17 00:00:00 2001
From: kaipi <kaipi@google.com>
Date: Mon, 6 Aug 2018 16:07:51 -0700
Subject: Add objc-fully-link to the list of actions that require the apple_env
 feature. This fixes apple_static_library functionality.

PiperOrigin-RevId: 207625792
---
 src/test/shell/bazel/apple/bazel_apple_test.sh | 26 ++++++++++++++++++++++++++
 tools/osx/crosstool/CROSSTOOL.tpl              | 10 ++++++++++
 2 files changed, 36 insertions(+)

diff --git a/src/test/shell/bazel/apple/bazel_apple_test.sh b/src/test/shell/bazel/apple/bazel_apple_test.sh
index 18b093a9e0..a84daa86b0 100755
--- a/src/test/shell/bazel/apple/bazel_apple_test.sh
+++ b/src/test/shell/bazel/apple/bazel_apple_test.sh
@@ -414,4 +414,30 @@ EOF
       || fail "should build apple_binary with dSYMs"
 }
 
+function test_apple_static_library() {
+  rm -rf package
+  mkdir -p package
+  cat > package/BUILD <<EOF
+apple_static_library(
+    name = "static_lib",
+    deps = [":dummy_lib"],
+    platform_type = "ios",
+)
+objc_library(
+    name = "dummy_lib",
+    srcs = ["dummy.m"],
+)
+EOF
+  cat > "package/dummy.m" <<EOF
+static int dummy __attribute__((unused,used)) = 0;
+EOF
+
+  bazel build --verbose_failures //package:static_lib \
+      --apple_crosstool_transition \
+      --ios_multi_cpus=i386,x86_64 \
+      --ios_minimum_os=8.0 \
+      --xcode_version=$XCODE_VERSION \
+      || fail "should build apple_static_library"
+}
+
 run_suite "apple_tests"
diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index 0e2964393d..daa21717f2 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -983,6 +983,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -2639,6 +2640,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -4304,6 +4306,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -5968,6 +5971,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -7661,6 +7665,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -9324,6 +9329,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -10977,6 +10983,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -12629,6 +12636,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -14310,6 +14318,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
@@ -15962,6 +15971,7 @@ toolchain {
       action: "objc-compile"
       action: "objc++-compile"
       action: "objc-archive"
+      action: "objc-fully-link"
       action: "c++-link-executable"
       action: "c++-link-dynamic-library"
       action: "c++-link-nodeps-dynamic-library"
-- 
cgit v1.2.3