Merge branch 'master' into release-0.15.0

ldc-developers · Dec 9, 2014 · c2e9a38 · c2e9a38
2 parents bc5dded + 0fa4201
commit c2e9a38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/driver/linker.cpp b/driver/linker.cpp
@@ -396,7 +396,11 @@ void createStaticLibrary()
 {
     Logger::println("*** Creating static library ***");
 
+#if LDC_LLVM_VER >= 305
+    const bool isTargetWindows = global.params.targetTriple.isWindowsMSVCEnvironment();
+#else
     const bool isTargetWindows = global.params.targetTriple.getOS() == llvm::Triple::Win32;
+#endif
 
     // find archiver
     std::string tool(isTargetWindows ? getLib() : getArchiver());

diff --git a/runtime/druntime b/runtime/druntime