about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTamir Duberstein <tamird@gmail.com>2015-05-29 12:36:13 -0400
committerTamir Duberstein <tamird@gmail.com>2015-07-06 08:40:40 -0400
commit158fcbbdd6db45058530abda35ce59d267ee489e (patch)
tree7615b2ff10a5350b94a786a3b64c3b71cc9d5b8c
parent155c8f9fa8d67badabd72bec16b9a9b3f49eb8a1 (diff)
downloadrust-158fcbbdd6db45058530abda35ce59d267ee489e.tar.gz
rust-158fcbbdd6db45058530abda35ce59d267ee489e.zip
`llconfig` is `llvm-config`
-rw-r--r--src/etc/mklldeps.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/etc/mklldeps.py b/src/etc/mklldeps.py
index d0f91ba683f..1cc65406b2c 100644
--- a/src/etc/mklldeps.py
+++ b/src/etc/mklldeps.py
@@ -16,7 +16,7 @@ f = open(sys.argv[1], 'wb')
 
 components = sys.argv[2].split() # splits on whitespace
 enable_static = sys.argv[3]
-llconfig = sys.argv[4]
+llvm_config = sys.argv[4]
 
 f.write("""// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
@@ -38,7 +38,7 @@ def run(args):
     out, err = proc.communicate()
 
     if err:
-        print("failed to run llconfig: args = `{}`".format(args))
+        print("failed to run llvm_config: args = `{}`".format(args))
         print(err)
         sys.exit(1)
     return out
@@ -46,7 +46,7 @@ def run(args):
 f.write("\n")
 
 # LLVM libs
-args = [llconfig, '--libs', '--system-libs']
+args = [llvm_config, '--libs', '--system-libs']
 
 args.extend(components)
 out = run(args)
@@ -68,13 +68,13 @@ for lib in out.strip().replace("\n", ' ').split(' '):
     f.write(")]\n")
 
 # LLVM ldflags
-out = run([llconfig, '--ldflags'])
+out = run([llvm_config, '--ldflags'])
 for lib in out.strip().split(' '):
     if lib[:2] == "-l":
         f.write("#[link(name = \"" + lib[2:] + "\")]\n")
 
 # C++ runtime library
-out = run([llconfig, '--cxxflags'])
+out = run([llvm_config, '--cxxflags'])
 if enable_static == '1':
     assert('stdlib=libc++' not in out)
     f.write("#[link(name = \"stdc++\", kind = \"static\")]\n")