---

yaml
---
r: 217896
b: refs/heads/master
c: 158fcbb
h: refs/heads/master
v: v3

Author: tamird

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 155c8f9fa8d67badabd72bec16b9a9b3f49eb8a1
+refs/heads/master: 158fcbbdd6db45058530abda35ce59d267ee489e
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/etc/mklldeps.py

@@ -16,7 +16,7 @@
 
 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,15 +38,15 @@ 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
 
 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 @@ def run(args):
     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")