From 4fbcd9b9c40ca1f4a7fc38dc9663c5a11f9bf5c9 Mon Sep 17 00:00:00 2001 From: Robert Clipsham Date: Thu, 9 Jul 2009 12:36:08 +0100 Subject: [PATCH] A couple of ldc2 tweaks now druntime compiles. --- gen/main.cpp | 4 +++- gen/runtime.cpp | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gen/main.cpp b/gen/main.cpp index 24f3e147..2f1ecf2b 100644 --- a/gen/main.cpp +++ b/gen/main.cpp @@ -318,7 +318,9 @@ int main(int argc, char** argv) } else if (!noDefaultLib) { -#if !DMDV2 +#if DMDV2 + global.params.linkswitches->push(mem.strdup("-ldruntime-ldc")); +#else global.params.linkswitches->push(mem.strdup("-lldc-runtime")); global.params.linkswitches->push(mem.strdup("-ltango-cc-tango")); global.params.linkswitches->push(mem.strdup("-ltango-gc-basic")); diff --git a/gen/runtime.cpp b/gen/runtime.cpp index 43a64f4c..e5fe2079 100644 --- a/gen/runtime.cpp +++ b/gen/runtime.cpp @@ -336,11 +336,7 @@ static void LLVM_D_BuildRuntimeModule() // Object _d_allocclass(ClassInfo ci) { -#if DMDV2 - std::string fname("_d_newclass"); -#else std::string fname("_d_allocclass"); -#endif std::vector types; types.push_back(classInfoTy); const llvm::FunctionType* fty = llvm::FunctionType::get(voidPtrTy, types, false);