From 76cf66f50bf8e4a8ee2b36c3f979a1fedbf1d687 Mon Sep 17 00:00:00 2001 From: kai Date: Fri, 3 Aug 2012 16:44:34 +0200 Subject: [PATCH] Expose LLVM as global version symbol. Required because prototypes of intrinsics changed between 3.0 and 3.1. --- driver/main.cpp | 7 +++++++ runtime/druntime | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/driver/main.cpp b/driver/main.cpp index aebedff1..18d033dd 100644 --- a/driver/main.cpp +++ b/driver/main.cpp @@ -695,6 +695,13 @@ int main(int argc, char** argv) fatal(); } + // Expose LLVM version to runtime +#define STR(x) #x +#define XSTR(x) STR(x) + VersionCondition::addPredefinedGlobalIdent("LDC_LLVM_"XSTR(LDC_LLVM_VER)); +#undef XSTR +#undef STR + if (global.params.os == OSWindows) { global.dll_ext = "dll"; global.lib_ext = "lib"; diff --git a/runtime/druntime b/runtime/druntime index e89eb4b3..6ac9475a 160000 --- a/runtime/druntime +++ b/runtime/druntime @@ -1 +1 @@ -Subproject commit e89eb4b3ad490d56525c2876442c223955e323cf +Subproject commit 6ac9475aa22924887d5010f41a4dc577836fbbdf