commit 0e668c12ede14efdbc826613273c1b856951b416
author cparsons <cparsons@google.com> Mon Dec 18 15:15:10 2017 -0800
committer Copybara-Service <copybara-piper@google.com> Mon Dec 18 15:17:08 2017 -0800
tree 1e97e27c7057bf5a6f729fe05f1b9ff50a99cbe8
parent 8a2baea4513f0989be8dc5ea89ca9ddb5b2555eb

Add two action types to the list of those requiring apple_env

These two action types, 'linkstamp-compile' and 'c++-link-interface-dynamic-library', require use of the wrapped_clang tool, which requires apple_env to be set.

RELNOTES: None.
PiperOrigin-RevId: 179475470

tools/osx/crosstool/CROSSTOOL.tpl

diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index 555c48c..79861cd 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -980,8 +980,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -2590,8 +2592,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -4209,8 +4213,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -5827,8 +5833,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -7474,8 +7482,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -9091,8 +9101,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -10698,8 +10710,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -12304,8 +12318,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -13939,8 +13955,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"
@@ -15547,8 +15565,10 @@
       action: "c++-link-alwayslink-static-library"
       action: "c++-link-pic-static-library"
       action: "c++-link-alwayslink-pic-static-library"
+      action: "c++-link-interface-dynamic-library"
       action: "objc-executable"
       action: "objc++-executable"
+      action: "linkstamp-compile"
       env_entry {
         key: "XCODE_VERSION_OVERRIDE"
         value: "%{xcode_version_override_value}"