mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-13 22:48:43 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into merge-2.078

Browse source 
Conflicts:
	driver/main.cpp
	gen/cl_helpers.h
	gen/declarations.cpp
	runtime/druntime
	tests/d2/dmd-testsuite
This commit is contained in:
Martin 2018-01-20 11:13:00 +01:00
commit 197e65efde
83 changed files with 5863 additions and 626 deletions
Download patch file Download diff file Expand all files Collapse all files

12
driver/linker.cpp
View file

@ -20,15 +20,11 @@
//////////////////////////////////////////////////////////////////////////////
static llvm::cl::opt<llvm::cl::boolOrDefault>
staticFlag("static", llvm::cl::ZeroOrMore,
llvm::cl::desc("Create a statically linked binary, including "
"all system dependencies"));
#if LDC_WITH_LLD
static llvm::cl::opt<bool>
useInternalLinker("link-internally", llvm::cl::ZeroOrMore, llvm::cl::Hidden,
llvm::cl::desc("Use internal LLD for linking"));
llvm::cl::desc("Use internal LLD for linking"),
llvm::cl::cat(opts::linkingCategory));
#else
constexpr bool useInternalLinker = false;
#endif
@ -134,10 +130,10 @@ int linkObjToBinary() {
createDirectoryForFileOrFail(gExePath);
if (global.params.targetTriple->isWindowsMSVCEnvironment()) {
return linkObjToBinaryMSVC(gExePath, useInternalLinker, staticFlag);
return linkObjToBinaryMSVC(gExePath, useInternalLinker, opts::staticFlag);
}
return linkObjToBinaryGcc(gExePath, useInternalLinker, staticFlag);
return linkObjToBinaryGcc(gExePath, useInternalLinker, opts::staticFlag);
}
//////////////////////////////////////////////////////////////////////////////