diff options
author | 2018-07-13 07:03:48 -0700 | |
---|---|---|
committer | 2018-07-13 07:05:10 -0700 | |
commit | 6de73e9854a9e33a5d31eefbbfaf904662575103 (patch) | |
tree | effa0bb787def165bb0b7b42145ddf2fa4993238 /src/main/java/com | |
parent | d1d613c9e93ce69e3880728350d1cff959f6845d (diff) |
Stop setting G3_VERSION_INFO C++ linkstamp variable.
RELNOTES:
No longer define G3_VERSION_INFO for c++ linkstamp compiles, as it was a duplicate of G3_TARGET_NAME.
PiperOrigin-RevId: 204466459
Diffstat (limited to 'src/main/java/com')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java index ce8d5bc89c..e989097ddd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java @@ -93,14 +93,12 @@ public class CppLinkstampCompileHelper { ImmutableList.<String>builder() .add("GPLATFORM=\"" + cppConfiguration + "\"") .add("BUILD_COVERAGE_ENABLED=" + (codeCoverageEnabled ? "1" : "0")) - // G3_VERSION_INFO and G3_TARGET_NAME are C string literals that normally - // contain the label of the target being linked. However, they are set - // differently when using shared native deps. In that case, a single .so file - // is shared by multiple targets, and its contents cannot depend on which - // target(s) were specified on the command line. So in that case we have - // to use the (obscure) name of the .so file instead, or more precisely - // the path of the .so file relative to the workspace root. - .add("G3_VERSION_INFO=\"${LABEL}\"") + // G3_TARGET_NAME is a C string literal that normally contain the label of the target + // being linked. However, they are set differently when using shared native deps. In + // that case, a single .so file is shared by multiple targets, and its contents cannot + // depend on which target(s) were specified on the command line. So in that case we + // have to use the (obscure) name of the .so file instead, or more precisely the path of + // the .so file relative to the workspace root. .add("G3_TARGET_NAME=\"${LABEL}\"") // G3_BUILD_TARGET is a C string literal containing the output of this // link. (An undocumented and untested invariant is that G3_BUILD_TARGET is the |