Skip to content

Commit 029f0bc

Browse files
committed
[Driver] Fix searching for SwiftDriver on Windows
1 parent 5d55ffe commit 029f0bc

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Diff for: lib/DriverTool/driver.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "swift/FrontendTool/FrontendTool.h"
3333
#include "swift/DriverTool/DriverTool.h"
3434
#include "llvm/ADT/SmallVector.h"
35+
#include "llvm/ADT/Triple.h"
3536
#include "llvm/Support/CommandLine.h"
3637
#include "llvm/Support/ConvertUTF.h"
3738
#include "llvm/Support/Errno.h"
@@ -168,12 +169,13 @@ static bool appendSwiftDriverName(SmallString<256> &buffer) {
168169
return true;
169170
}
170171

171-
llvm::sys::path::append(buffer, "swift-driver");
172+
StringRef execSuffix(llvm::Triple(llvm::sys::getProcessTriple()).isOSWindows() ? ".exe" : "");
173+
llvm::sys::path::append(buffer, "swift-driver" + execSuffix);
172174
if (llvm::sys::fs::exists(buffer)) {
173175
return true;
174176
}
175177
llvm::sys::path::remove_filename(buffer);
176-
llvm::sys::path::append(buffer, "swift-driver-new");
178+
llvm::sys::path::append(buffer, "swift-driver-new" + execSuffix);
177179
if (llvm::sys::fs::exists(buffer)) {
178180
return true;
179181
}

0 commit comments

Comments
 (0)