mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-04 17:11:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into runtime_compile_v5

Browse source
This commit is contained in:
Ivan 2017-11-01 22:24:27 +03:00
commit ae4db7d3b3
180 changed files with 15036 additions and 10675 deletions
Download patch file Download diff file Expand all files Collapse all files

8
driver/linker-msvc.cpp
View file

@ -62,8 +62,6 @@ int linkObjToBinaryMSVC(llvm::StringRef outputPath, bool useInternalLinker,
windows::setupMsvcEnvironment();
#endif
const std::string tool = "link.exe";
// build arguments
std::vector<std::string> args;
@ -185,5 +183,9 @@ int linkObjToBinaryMSVC(llvm::StringRef outputPath, bool useInternalLinker,
#endif
// try to call linker
return executeToolAndWait(tool, args, global.params.verbose);
std::string linker = opts::linker;
if (linker.empty())
linker = "link.exe";
return executeToolAndWait(linker, args, global.params.verbose);
}