---

yaml
---
r: 13183
b: refs/heads/master
c: 7335b2a
h: refs/heads/master
i:
  13181: 09af3a0
  13179: 11730d6
  13175: 0c2ee15
  13167: 0a9e5b9
  13151: 121a234
  13119: 0d6dbec
  13055: bb1c77a
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8f7364b26d22f945f1e013041730caaedc640a80
+refs/heads/master: 7335b2a51c0b7f7ada6227134bd2b86c08b66813
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/compiletest/procsrv.rs

@@ -9,9 +9,13 @@ fn target_env(lib_path: str, prog: str) -> [(str,str)] {
 
     let mut env = os::env();
 
+    // Make sure we include the aux directory in the path
+    assert prog.ends_with(".exe");
+    let aux_path = prog.slice(0u, prog.len() - 4u) + ".libaux";
+
     env = vec::map(env) {|pair|
         let (k,v) = pair;
-        if k == "PATH" { ("PATH", v + ";" + lib_path) }
+        if k == "PATH" { ("PATH", v + ";" + lib_path + ";" + aux_path) }
         else { (k,v) }
     };
     if str::ends_with(prog, "rustc.exe") {