From e2d6ba911a070e10421cb06f635bac0a4d981494 Mon Sep 17 00:00:00 2001 From: pcloudy Date: Wed, 13 Jun 2018 01:46:40 -0700 Subject: Change generated DEF file name from .def to .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 .def. Fixed https://github.com/bazelbuild/bazel/issues/5357 RELNOTES: None PiperOrigin-RevId: 200354303 --- src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib') 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 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()); -- cgit v1.2.3