From 7e62aa68018c94bcfc3fd6beab90cf7b87f91cbf Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Mon, 16 Aug 2010 13:02:46 -0700 Subject: Absent any deep overhauls to syntax or constant-handling, hack in the ability to project a cexp var binding to a token in the parser. Use it in comp/rustc.rc and comp/lib/llvm.rs. --- src/comp/lib/llvm.rs | 2 +- src/comp/rustc.rc | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/comp') diff --git a/src/comp/lib/llvm.rs b/src/comp/lib/llvm.rs index af6a6893..e12108b6 100644 --- a/src/comp/lib/llvm.rs +++ b/src/comp/lib/llvm.rs @@ -6,7 +6,7 @@ type LongLong = i64; type Long = i32; type Bool = int; -native mod llvm = "libLLVM-2.7.so" { +native mod llvm = llvm_lib { type ModuleRef; type ContextRef; diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc index 87dbc6b4..b61b8022 100644 --- a/src/comp/rustc.rc +++ b/src/comp/rustc.rc @@ -14,7 +14,23 @@ mod driver { } mod lib { - mod llvm; + alt (target_os) { + case ("win32") { + let (llvm_lib = "llvm-2.8svn.dll") { + mod llvm; + } + } + case ("macos") { + let (llvm_lib = "libllvm-2.8svn.dylib") { + mod llvm; + } + } + else { + let (llvm_lib = "libllvm-2.8svn.so") { + mod llvm; + } + } + } } // Local Variables: -- cgit v1.2.3