[libclc] r198167 - Fix build with LLVM 3.5

Aaron Watry awatry at gmail.com
Sun Dec 29 08:39:53 PST 2013


Author: awatry
Date: Sun Dec 29 10:39:53 2013
New Revision: 198167

URL: http://llvm.org/viewvc/llvm-project?rev=198167&view=rev
Log:
Fix build with LLVM 3.5

Reviewed-by: Aaron Watry <awatry at gmail.com>

Modified:
    libclc/trunk/configure.py

Modified: libclc/trunk/configure.py
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/configure.py?rev=198167&r1=198166&r2=198167&view=diff
==============================================================================
--- libclc/trunk/configure.py (original)
+++ libclc/trunk/configure.py Sun Dec 29 10:39:53 2013
@@ -10,6 +10,7 @@ version_patch = 1;
 
 from optparse import OptionParser
 import os
+import string
 from subprocess import *
 import sys
 
@@ -62,8 +63,13 @@ def llvm_config(args):
     print "Please ensure that llvm-config is in your $PATH, or use --with-llvm-config."
     sys.exit(1)
 
+llvm_version = string.split(string.replace(llvm_config(['--version']), 'svn', ''), '.')
+llvm_system_libs = ''
+if (int(llvm_version[0]) == 3 and int(llvm_version[1]) >= 5) or int(llvm_version[0]) > 3:
+    llvm_system_libs = llvm_config(['--system-libs'])
 llvm_bindir = llvm_config(['--bindir'])
 llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' ' + \
+                 llvm_system_libs + ' ' + \
                  llvm_config(['--ldflags'])
 llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
 





More information about the cfe-commits mailing list