---

yaml
---
r: 92402
b: refs/heads/auto
c: b0a9937
h: refs/heads/master
v: v3

Author: klutzy

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1890290ded2b56410b4b2e0dca4c1518b294a2b2
+refs/heads/auto: b0a9937a6d252eaf6c936284c377227ae510cc0f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/llvm.mk

@@ -51,8 +51,7 @@ $(S)src/librustc/lib/llvmdeps.rs: \
 		    $(LLVM_CONFIGS) \
 		    $(S)src/etc/mklldeps.py
 	$(Q)$(CFG_PYTHON) $(S)src/etc/mklldeps.py \
-	    "$(LLVM_COMPONENTS)" $(LLVM_CONFIGS) \
-	    > $@
+	    "$@" "$(LLVM_COMPONENTS)" $(LLVM_CONFIGS)
 
 $(foreach host,$(CFG_HOST), \
  $(eval $(call DEF_LLVM_RULES,$(host))))

branches/auto/src/etc/mklldeps.py

@@ -4,9 +4,11 @@
 import sys
 import subprocess
 
-components = sys.argv[1].split(' ')
+f = open(sys.argv[1], 'wb')
 
-print """// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+components = sys.argv[2].split(' ')
+
+f.write("""// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -18,10 +20,10 @@
 
 // WARNING: THIS IS A GENERATED FILE, DO NOT MODIFY
 //          take a look at src/etc/mklldeps.py if you're interested
-"""
+""")
 
-for llconfig in sys.argv[2:]:
-    print
+for llconfig in sys.argv[3:]:
+    f.write("\n")
 
     proc = subprocess.Popen([llconfig, '--host-target'], stdout = subprocess.PIPE)
     out, err = proc.communicate()
@@ -42,7 +44,7 @@
         "target_os = \"" + os + "\"",
     ]
 
-    print "#[cfg(" + ', '.join(cfg) + ")]"
+    f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
 
     args = [llconfig, '--libs']
     args.extend(components)
@@ -51,7 +53,7 @@
 
     for lib in out.strip().split(' '):
         lib = lib[2:] # chop of the leading '-l'
-        print "#[link(name = \"" + lib + "\", kind = \"static\")]"
+        f.write("#[link(name = \"" + lib + "\", kind = \"static\")]\n")
     if os == 'win32':
-        print "#[link(name = \"imagehlp\")]"
-    print "extern {}"
+        f.write("#[link(name = \"imagehlp\")]\n")
+    f.write("extern {}\n")