aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/osx
diff options
context:
space:
mode:
authorGravatar cparsons <cparsons@google.com>2017-12-18 15:15:10 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2017-12-18 15:17:08 -0800
commit0e668c12ede14efdbc826613273c1b856951b416 (patch)
tree1e97e27c7057bf5a6f729fe05f1b9ff50a99cbe8 /tools/osx
parent8a2baea4513f0989be8dc5ea89ca9ddb5b2555eb (diff)
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
Diffstat (limited to 'tools/osx')
-rw-r--r--tools/osx/crosstool/CROSSTOOL.tpl20
1 files changed, 20 insertions, 0 deletions
diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index 555c48cb1b..79861cd321 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -980,8 +980,10 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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 @@ toolchain {
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}"