Skip to content

Commit c2e9a38

Browse files
committed
Merge branch 'master' into release-0.15.0
2 parents bc5dded + 0fa4201 commit c2e9a38

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

driver/linker.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,11 @@ void createStaticLibrary()
396396
{
397397
Logger::println("*** Creating static library ***");
398398

399+
#if LDC_LLVM_VER >= 305
400+
const bool isTargetWindows = global.params.targetTriple.isWindowsMSVCEnvironment();
401+
#else
399402
const bool isTargetWindows = global.params.targetTriple.getOS() == llvm::Triple::Win32;
403+
#endif
400404

401405
// find archiver
402406
std::string tool(isTargetWindows ? getLib() : getArchiver());

runtime/druntime

0 commit comments

Comments
 (0)