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

Add -mscrtlib cmdline option and support -static on Windows (#2041)

Browse source 
The default MS C runtime library doesn't depend on the `LINK_WITH_MSVCRT`
CMake variable anymore.

The user can freely choose among the 4 variants libcmt[d] / msvcrt[d] via
-mscrtlib or choose between static/dynamic release variant via -static.

LDC keeps on defaulting to the static release C runtime, so
`-static=false` or `-mscrtlib=msvcrt[d]` must be used explicitly in order
to link against the runtime DLLs.
This commit is contained in:
kinke 2017-04-09 01:17:28 +02:00 • committed by GitHub
parent 1dfe11c961
commit a5139499a3
4 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
driver/linker.cpp
View file

@ -39,6 +39,12 @@ static llvm::cl::opt<bool> staticFlag(
"Create a statically linked binary, including all system dependencies"),
llvm::cl::ZeroOrMore);
static llvm::cl::opt<std::string> mscrtlib(
"mscrtlib",
llvm::cl::desc(
"MS C runtime library to link against (libcmt[d] / msvcrt[d])"),
llvm::cl::value_desc("name"), llvm::cl::ZeroOrMore);
static llvm::cl::opt<std::string>
ltoLibrary("flto-binary",
llvm::cl::desc("Set the linker LTO plugin library file (e.g. "
@ -280,7 +286,7 @@ static void appendObjectFiles(std::vector<std::string> &args) {
static std::string gExePath;
static int linkObjToBinaryGcc(bool sharedLib, bool fullyStatic) {
static int linkObjToBinaryGcc(bool sharedLib) {
Logger::println("*** Linking executable ***");
// find gcc for linking
@ -317,7 +323,7 @@ static int linkObjToBinaryGcc(bool sharedLib, bool fullyStatic) {
args.push_back("-shared");
}
if (fullyStatic) {
if (staticFlag) {
args.push_back("-static");
}
@ -489,6 +495,26 @@ static int linkObjToBinaryGcc(bool sharedLib, bool fullyStatic) {
//////////////////////////////////////////////////////////////////////////////
static void addMscrtLibs(std::vector<std::string> &args) {
llvm::StringRef mscrtlibName = mscrtlib;
if (mscrtlibName.empty()) {
// default to static release variant
mscrtlibName =
staticFlag || staticFlag.getNumOccurrences() == 0 ? "libcmt" : "msvcrt";
}
args.push_back(("/DEFAULTLIB:" + mscrtlibName).str());
const bool isStatic = mscrtlibName.startswith_lower("libcmt");
const bool isDebug =
mscrtlibName.endswith_lower("d") || mscrtlibName.endswith_lower("d.lib");
const llvm::StringRef prefix = isStatic ? "lib" : "";
const llvm::StringRef suffix = isDebug ? "d" : "";
args.push_back(("/DEFAULTLIB:" + prefix + "vcruntime" + suffix).str());
}
static int linkObjToBinaryMSVC(bool sharedLib) {
Logger::println("*** Linking executable ***");
@ -528,6 +554,9 @@ static int linkObjToBinaryMSVC(bool sharedLib) {
args.push_back("/OPT:ICF");
}
// add C runtime libs
addMscrtLibs(args);
// specify creation of DLL
if (sharedLib) {
args.push_back("/DLL");
@ -604,11 +633,10 @@ static int linkObjToBinaryMSVC(bool sharedLib) {
int linkObjToBinary() {
if (global.params.targetTriple->isWindowsMSVCEnvironment()) {
// TODO: Choose dynamic/static MSVCRT version based on staticFlag?
return linkObjToBinaryMSVC(global.params.dll);
}
return linkObjToBinaryGcc(global.params.dll, staticFlag);
return linkObjToBinaryGcc(global.params.dll);
}
//////////////////////////////////////////////////////////////////////////////