Imported Upstream version 1.1.0+dfsg1

[rustc.git] / src / etc / mklldeps.py

diff --git a/src/etc/mklldeps.py b/src/etc/mklldeps.py
index e5e8c9f11bd82691e823583bfc140d4c46d1664c..fe9feb3538d15493fb8f425743b053dd4d84058a 100644 (file)
--- a/src/etc/mklldeps.py
+++ b/src/etc/mklldeps.py
@@ -46,13 +46,8 @@ def run(args):
 
 f.write("\n")
 
-version = run([llconfig, '--version']).strip()
-
 # LLVM libs
-if version < '3.5':
-    args = [llconfig, '--libs']
-else:
-    args = [llconfig, '--libs', '--system-libs']
+args = [llconfig, '--libs', '--system-libs']
 
 args.extend(components)
 out = run(args)
@@ -73,11 +68,6 @@ for lib in out.strip().replace("\n", ' ').split(' '):
         f.write(", kind = \"static\"")
     f.write(")]\n")
 
-# llvm-config before 3.5 didn't have a system-libs flag
-if version < '3.5':
-    if os == 'win32':
-        f.write("#[link(name = \"imagehlp\")]")
-
 # LLVM ldflags
 out = run([llconfig, '--ldflags'])
 for lib in out.strip().split(' '):