---

sfackler · sfackler · commit 1cf711070e5b · 2014-09-30T12:52:47.000-07:00
yaml --- r: 155568 b: refs/heads/try2 c: c4e0755 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 99e2bb79b621ebdbe7190ade1717dc5a9166e224
+refs/heads/try2: c4e0755245a476d688edb0cda955b7d0c10f417b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/etc/mklldeps.py b/branches/try2/src/etc/mklldeps.py
@@ -67,7 +67,7 @@ def run(args):
         "target_os = \"" + os + "\"",
     ]
 
-    f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
+    f.write("#[cfg(all(" + ', '.join(cfg) + "))]\n")
 
     version = run([llconfig, '--version']).strip()
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ def run(args):`
`67`	`67`	`"target_os = \"" + os + "\"",`
`68`	`68`	`]`
`69`	`69`
`70`		`- f.write("#[cfg(" + ', '.join(cfg) + ")]\n")`
	`70`	`+ f.write("#[cfg(all(" + ', '.join(cfg) + "))]\n")`
`71`	`71`
`72`	`72`	`version = run([llconfig, '--version']).strip()`
`73`	`73`