diff options
author | Martin Storsjo <martin@martin.st> | 2018-02-27 19:42:19 +0000 |
---|---|---|
committer | Martin Storsjo <martin@martin.st> | 2018-02-27 19:42:19 +0000 |
commit | ca4a24eb72aab56419ec41970fc1880d8bf22638 (patch) | |
tree | c69050a9dc833a51e3fbb413f02081757996fb96 /clang/lib/Driver/ToolChains/CrossWindows.cpp | |
parent | d1400213f524607820734ebf2efdf5e12db4a662 (diff) | |
download | bcm5719-llvm-ca4a24eb72aab56419ec41970fc1880d8bf22638.tar.gz bcm5719-llvm-ca4a24eb72aab56419ec41970fc1880d8bf22638.zip |
[MinGW, CrossWindows] Allow passing -static together with -shared
In these combinations, link a DLL as usual, but pass -Bstatic instead
of -Bdynamic to indicate prefering static libraries.
Differential Revision: https://reviews.llvm.org/D43811
llvm-svn: 326235
Diffstat (limited to 'clang/lib/Driver/ToolChains/CrossWindows.cpp')
-rw-r--r-- | clang/lib/Driver/ToolChains/CrossWindows.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains/CrossWindows.cpp b/clang/lib/Driver/ToolChains/CrossWindows.cpp index 5049033c413..6ca04a8a3ab 100644 --- a/clang/lib/Driver/ToolChains/CrossWindows.cpp +++ b/clang/lib/Driver/ToolChains/CrossWindows.cpp @@ -127,7 +127,8 @@ void tools::CrossWindows::Linker::ConstructJob( } CmdArgs.push_back("-shared"); - CmdArgs.push_back("-Bdynamic"); + CmdArgs.push_back(Args.hasArg(options::OPT_static) ? "-Bstatic" + : "-Bdynamic"); CmdArgs.push_back("--enable-auto-image-base"); |