diff options
author | Googler <noreply@google.com> | 2017-11-10 22:00:37 +0100 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2017-11-10 23:28:13 +0100 |
commit | 5d6d28e07f58600090055da7e62454cfc2677fbf (patch) | |
tree | 5cc6d42720544c1e5f7ff207c6a09a81945ce92f /tools | |
parent | 694105dc2b6056c6c8330d9a0d3af9cff7edf7d5 (diff) |
Remove bazel's --experimental_skip_static_outputs option.
It was added long ago, for reasons which are no longer relevant or
useful.
Also remove the build variable it controlled ("skip_mostly_static")
from CROSSTOOL files.
RELNOTES: None.
PiperOrigin-RevId: 175325225
Diffstat (limited to 'tools')
-rw-r--r-- | tools/osx/crosstool/CROSSTOOL.tpl | 300 |
1 files changed, 20 insertions, 280 deletions
diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl index 8cd191b532..6592b665dc 100644 --- a/tools/osx/crosstool/CROSSTOOL.tpl +++ b/tools/osx/crosstool/CROSSTOOL.tpl @@ -285,36 +285,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -1567,7 +1541,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -1941,36 +1915,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -3230,7 +3178,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -3604,6 +3552,7 @@ toolchain { feature { name: "output_execpath_flags" flag_set { + action: "c++-link-executable" action: "c++-link-dynamic-library" flag_group { flag: "-o" @@ -3613,33 +3562,6 @@ toolchain { } } feature { - name: "output_execpath_flags_executable" - flag_set { - action: "c++-link-executable" - flag_group { - flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { name: "global_whole_archive_open" flag_set { action: "c++-link-executable" @@ -4895,7 +4817,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -5270,36 +5192,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -6587,7 +6483,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -6963,36 +6859,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -8252,7 +8122,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -8626,36 +8496,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -9903,7 +9747,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -10277,36 +10121,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -11556,7 +11374,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -11931,6 +11749,7 @@ toolchain { feature { name: "output_execpath_flags" flag_set { + action: "c++-link-executable" action: "c++-link-dynamic-library" flag_group { flag: "-o" @@ -11940,33 +11759,6 @@ toolchain { } } feature { - name: "output_execpath_flags_executable" - flag_set { - action: "c++-link-executable" - flag_group { - flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { name: "global_whole_archive_open" flag_set { action: "c++-link-executable" @@ -13236,7 +13028,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -13612,36 +13404,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -14889,7 +14655,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" @@ -15266,36 +15032,10 @@ toolchain { feature { name: "output_execpath_flags" flag_set { - action: "c++-link-dynamic-library" - flag_group { - flag: "-o" - flag: "%{output_execpath}" - } - expand_if_all_available: "output_execpath" - } - } - feature { - name: "output_execpath_flags_executable" - flag_set { action: "c++-link-executable" + action: "c++-link-dynamic-library" flag_group { flag: "-o" - } - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { - flag: "/dev/null" - flag: "-MMD" - flag: "-MF" - } - expand_if_all_available: "skip_mostly_static" - expand_if_all_available: "output_execpath" - } - flag_set { - action: "c++-link-executable" - flag_group { flag: "%{output_execpath}" } expand_if_all_available: "output_execpath" @@ -16543,7 +16283,7 @@ toolchain { implies: "contains_objc_source" implies: "symbol_counts" implies: "linkstamps" - implies: "output_execpath_flags_executable" + implies: "output_execpath_flags" implies: "global_whole_archive_open" implies: "runtime_root_flags" implies: "input_param_flags" |