Add an "exe" suffix only if the output file has no suffix at all.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52289 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index 0b8269c..4026562 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -532,15 +532,15 @@
#if defined(_WIN32) || defined(__CYGWIN__)
if (!LinkAsLibrary) {
- // Make sure the output executable has an "exe" suffix.
+ // Default to "a.exe" instead of "a.out".
+ if (OutputFilename.getNumOccurrences() == 0)
+ OutputFilename = "a.exe";
+
+ // If there is no suffix add an "exe" one.
sys::Path ExeFile( OutputFilename );
- if (ExeFile.getSuffix() != "exe") {
- if (OutputFilename == "a.out") {
- OutputFilename = "a.exe";
- } else {
- ExeFile.appendSuffix("exe");
- OutputFilename = ExeFile.toString();
- }
+ if (ExeFile.getSuffix() == "") {
+ ExeFile.appendSuffix("exe");
+ OutputFilename = ExeFile.toString();
}
}
#endif