dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Driver] Allow using a canonical form of '-fuse-ld=' when cross-compiling on Windows. 

clang used to require adding an ".exe" suffix when targeting ELF systems on Windows.

Differential Revision: https://reviews.llvm.org/D43621

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@326164 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Igor Kudrin 2018-02-27 02:51:30 +00:00
parent 54d1490d2d
commit d222eefb79
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Driver/ToolChain.cpp
View File

@ -412,7 +412,7 @@ std::string ToolChain::GetLinkerPath() const {
if (llvm::sys::path::is_absolute(UseLinker)) {
// If we're passed what looks like an absolute path, don't attempt to
// second-guess that.
if (llvm::sys::fs::exists(UseLinker))
if (llvm::sys::fs::can_execute(UseLinker))
return UseLinker;
} else if (UseLinker.empty() || UseLinker == "ld") {
// If we're passed -fuse-ld= with no argument, or with the argument ld,
@ -427,7 +427,7 @@ std::string ToolChain::GetLinkerPath() const {
LinkerName.append(UseLinker);
std::string LinkerPath(GetProgramPath(LinkerName.c_str()));
if (llvm::sys::fs::exists(LinkerPath))
if (llvm::sys::fs::can_execute(LinkerPath))
return LinkerPath;
}

0
test/Driver/Inputs/fuse_ld_windows/ld.foo.exe Executable file
View File

25
test/Driver/fuse-ld-windows.c Normal file
View File

@ -0,0 +1,25 @@
// REQUIRES: system-windows
// We used to require adding ".exe" suffix when cross-compiling on Windows.
// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
// RUN: -B %S/Inputs/fuse_ld_windows -fuse-ld=foo 2>&1 \
// RUN: | FileCheck %s
// Check that the old variant still works.
// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
// RUN: -B %S/Inputs/fuse_ld_windows -fuse-ld=foo.exe 2>&1 \
// RUN: | FileCheck %s
// With the full path, the extension can be omitted, too,
// because Windows allows that.
// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
// RUN: -fuse-ld=%S/Inputs/fuse_ld_windows/ld.foo 2>&1 \
// RUN: | FileCheck %s
// Check that the full path with the extension works too.
// RUN: %clang %s -### -o %t.o -target i386-unknown-linux \
// RUN: -fuse-ld=%S/Inputs/fuse_ld_windows/ld.foo.exe 2>&1 \
// RUN: | FileCheck %s
// CHECK-NOT: invalid linker name
// CHECK: /Inputs/fuse_ld_windows{{/|\\\\}}ld.foo