diff options
author | 2018-06-13 01:46:40 -0700 | |
---|---|---|
committer | 2018-06-13 01:47:46 -0700 | |
commit | e2d6ba911a070e10421cb06f635bac0a4d981494 (patch) | |
tree | e4dac52dd105afebb841e45721004820815f3abe /src/main/java/com/google/devtools/build/lib/rules/cpp | |
parent | b2ad4900c81ab767e736a118f755697a8958ed66 (diff) |
Change generated DEF file name from <target name>.def to <target name>.gen.def
This helps avoid name conflicts when users want to generate DEF files by themselves. For example, when using a genrule to do that, people naturally name the def file as <target name>.def.
Fixed https://github.com/bazelbuild/bazel/issues/5357
RELNOTES: None
PiperOrigin-RevId: 200354303
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index 0b19fd488f..91013a9bbc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -1029,7 +1029,9 @@ public class CppHelper { Artifact defParser, ImmutableList<Artifact> objectFiles, String dllName) { - Artifact defFile = ruleContext.getBinArtifact(ruleContext.getLabel().getName() + ".def"); + Artifact defFile = ruleContext.getBinArtifact( + ruleContext.getLabel().getName() + + ".gen" + Iterables.getOnlyElement(CppFileTypes.WINDOWS_DEF_FILE.getExtensions())); CustomCommandLine.Builder argv = new CustomCommandLine.Builder(); for (Artifact objectFile : objectFiles) { argv.addDynamicString(objectFile.getExecPathString()); |