Skip to content

Commit 1599d34

Browse files
committed
---
yaml --- r: 6497 b: refs/heads/master c: 4b13fdb h: refs/heads/master i: 6495: 10400e1 v: v3
1 parent c1eb99f commit 1599d34

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 21ffc55e576c2322ea3ab87af4168544588180b7
2+
refs/heads/master: 4b13fdbf277280cd493053edb4479a812b944a52

trunk/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)