From c2b6b87d06348f515de17232ee23073633bf3f3b Mon Sep 17 00:00:00 2001 From: kai Date: Mon, 8 Dec 2014 08:18:31 +0100 Subject: [PATCH 1/2] mingw uses ar not lib for creating static libraries. --- driver/linker.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/driver/linker.cpp b/driver/linker.cpp index 709a8005081..71752406288 100644 --- 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()); From 0fa4201dbba26dd3b41a3604061642620c01d3d8 Mon Sep 17 00:00:00 2001 From: kai Date: Tue, 9 Dec 2014 18:44:37 +0100 Subject: [PATCH 2/2] 2 more Solaris fixes --- runtime/druntime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/druntime b/runtime/druntime index 9577ad9e3ba..9c711749e5f 160000 --- a/runtime/druntime +++ b/runtime/druntime @@ -1 +1 @@ -Subproject commit 9577ad9e3baacdfa56fee372b92628023044c18c +Subproject commit 9c711749e5fffd197be6efe10a42bd6827aac127