Skip to content

Commit 4b13fdb

Browse files
committed
when type checking still pass in the rustc args from cmd line
otherwise we use the wrong target and things start to fail
1 parent 21ffc55 commit 4b13fdb

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/compiletest/runtest.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ actual:\n\
176176
fn make_typecheck_args(config: config, _testfile: str) -> procargs {
177177
let prog = config.rustc_path;
178178
let args = ["-", "--no-trans", "--lib"];
179+
args += split_maybe_args(config.rustcflags);
179180
ret {prog: prog, args: args};
180181
}
181182
}
@@ -243,12 +244,7 @@ fn make_compile_args(config: config, props: test_props, testfile: str) ->
243244
procargs {
244245
let prog = config.rustc_path;
245246
let args = [testfile, "-o", make_exe_name(config, testfile)];
246-
let rustcflags =
247-
alt config.rustcflags {
248-
option::some(s) { option::some(s) }
249-
option::none. { option::none }
250-
};
251-
args += split_maybe_args(rustcflags);
247+
args += split_maybe_args(config.rustcflags);
252248
args += split_maybe_args(props.compile_flags);
253249
ret {prog: prog, args: args};
254250
}

0 commit comments

Comments
 (0)