diff options
| author |  hlopko <hlopko@google.com> | 2018-03-12 08:39:27 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-12 08:41:00 -0700 |
| commit | fba6f119a2807142dd35471980fa49ee1cf7335e (patch) | |
| tree | 92a7ca5b60cd6872780941ba9dfb8dcd7003a5bf /src/main | |
| parent | e4c8509ace6baf5182379738b7834287228116cd (diff) | |
Unify action_configs for static libraries
We don't need to separate them into 4 different flavours, all crosstools define
them identically anyway.
RELNOTES: CppRules: Unified action_configs for static libraries
From now on only c++-link-static-library is read.
PiperOrigin-RevId: 188726352
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java | 38 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java | 6 |
2 files changed, 4 insertions, 40 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java index 3f06465378..b2c2c5804a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java @@ -500,33 +500,6 @@ public class CppActionConfigs { " implies: 'archiver_flags'", " implies: 'linker_param_file'", "}", - "action_config {", - " config_name: 'c++-link-alwayslink-static-library'", - " action_name: 'c++-link-alwayslink-static-library'", - " tool {", - " tool_path: '" + arToolPath + "'", - " }", - " implies: 'archiver_flags'", - " implies: 'linker_param_file'", - "}", - "action_config {", - " config_name: 'c++-link-pic-static-library'", - " action_name: 'c++-link-pic-static-library'", - " tool {", - " tool_path: '" + arToolPath + "'", - " }", - " implies: 'archiver_flags'", - " implies: 'linker_param_file'", - "}", - "action_config {", - " config_name: 'c++-link-alwayslink-pic-static-library'", - " action_name: 'c++-link-alwayslink-pic-static-library'", - " tool {", - " tool_path: '" + arToolPath + "'", - " }", - " implies: 'archiver_flags'", - " implies: 'linker_param_file'", - "}", ifTrue( supportsInterfaceSharedLibraries, "feature {", @@ -656,9 +629,6 @@ public class CppActionConfigs { " flag_set {", " expand_if_all_available: 'output_execpath'", " action: 'c++-link-static-library'", - " action: 'c++-link-alwayslink-static-library'", - " action: 'c++-link-pic-static-library'", - " action: 'c++-link-alwayslink-pic-static-library'", " flag_group {", ifLinux(platform, "flag: 'rcsD'", "flag: '%{output_execpath}'"), ifMac( @@ -670,11 +640,8 @@ public class CppActionConfigs { " }", " }", " flag_set { ", - " expand_if_all_available: 'libraries_to_link'", " action: 'c++-link-static-library'", - " action: 'c++-link-alwayslink-static-library'", - " action: 'c++-link-pic-static-library'", - " action: 'c++-link-alwayslink-pic-static-library'", + " expand_if_all_available: 'libraries_to_link'", " flag_group {", " iterate_over: 'libraries_to_link'", " flag_group {", @@ -1129,9 +1096,6 @@ public class CppActionConfigs { " flag_set {", " expand_if_all_available: 'linker_param_file'", " action: 'c++-link-static-library'", - " action: 'c++-link-alwayslink-static-library'", - " action: 'c++-link-pic-static-library'", - " action: 'c++-link-alwayslink-pic-static-library'", " flag_group {", " flag: '@%{linker_param_file}'", " }", diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java index 852e28e8b5..b70ab0a875 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/Link.java @@ -152,7 +152,7 @@ public abstract class Link { PIC_STATIC_LIBRARY( ".pic.a", Staticness.STATIC, - "c++-link-pic-static-library", + "c++-link-static-library", Picness.PIC, ArtifactCategory.STATIC_LIBRARY, Executable.NOT_EXECUTABLE), @@ -187,7 +187,7 @@ public abstract class Link { ALWAYS_LINK_STATIC_LIBRARY( ".lo", Staticness.STATIC, - "c++-link-alwayslink-static-library", + "c++-link-static-library", Picness.NOPIC, ArtifactCategory.ALWAYSLINK_STATIC_LIBRARY, Executable.NOT_EXECUTABLE), @@ -196,7 +196,7 @@ public abstract class Link { ALWAYS_LINK_PIC_STATIC_LIBRARY( ".pic.lo", Staticness.STATIC, - "c++-link-alwayslink-pic-static-library", + "c++-link-static-library", Picness.PIC, ArtifactCategory.ALWAYSLINK_STATIC_LIBRARY, Executable.NOT_EXECUTABLE), |