From 4b13fdbf277280cd493053edb4479a812b944a52 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Wed, 23 Nov 2011 16:18:32 -0800
Subject: [PATCH] when type checking still pass in the rustc args from cmd line
otherwise we use the wrong target and things start to fail
---
src/compiletest/runtest.rs | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index aad1e79b31f..59b14385b86 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -176,6 +176,7 @@ actual:\n\
fn make_typecheck_args(config: config, _testfile: str) -> procargs {
let prog = config.rustc_path;
let args = ["-", "--no-trans", "--lib"];
+ args += split_maybe_args(config.rustcflags);
ret {prog: prog, args: args};
}
}
@@ -243,12 +244,7 @@ fn make_compile_args(config: config, props: test_props, testfile: str) ->
procargs {
let prog = config.rustc_path;
let args = [testfile, "-o", make_exe_name(config, testfile)];
- let rustcflags =
- alt config.rustcflags {
- option::some(s) { option::some(s) }
- option::none. { option::none }
- };
- args += split_maybe_args(rustcflags);
+ args += split_maybe_args(config.rustcflags);
args += split_maybe_args(props.compile_flags);
ret {prog: prog, args: args};
}