diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-02-06 19:57:09 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-10 00:50:39 -0800 |
| commit | 071ee96277845af99bde5e7e15ccbb0cff9be0a7 (patch) | |
| tree | bb78ee17f71137362577ed86dd09f4597c4acbef /src/compiletest | |
| parent | 2780d9dd5410a5c093f27eacfb1684ddbfcb4632 (diff) | |
| download | rust-071ee96277845af99bde5e7e15ccbb0cff9be0a7.tar.gz rust-071ee96277845af99bde5e7e15ccbb0cff9be0a7.zip | |
Consolidate codegen-related compiler flags
Move them all behind a new -C switch. This migrates some -Z flags and some top-level flags behind this -C codegen option. The -C flag takes values of the form "-C name=value" where the "=value" is optional for some flags. Flags affected: * --llvm-args => -C llvm-args * --passes => -C passes * --ar => -C ar * --linker => -C linker * --link-args => -C link-args * --target-cpu => -C target-cpu * --target-feature => -C target-fature * --android-cross-path => -C android-cross-path * --save-temps => -C save-temps * --no-rpath => -C no-rpath * -Z no-prepopulate => -C no-prepopulate-passes * -Z no-vectorize-loops => -C no-vectorize-loops * -Z no-vectorize-slp => -C no-vectorize-slp * -Z soft-float => -C soft-float * -Z gen-crate-map => -C gen-crate-map * -Z prefer-dynamic => -C prefer-dynamic * -Z no-integrated-as => -C no-integrated-as As a bonus, this also promotes the -Z extra-debug-info flag to a first class -g or --debuginfo flag. * -Z debug-info => removed * -Z extra-debug-info => -g or --debuginfo Closes #9770 Closes #12000
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/runtest.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 8edd923390a..f906c0fc4e1 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -332,8 +332,8 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) { let args = split_maybe_args(&config.rustcflags); let mut tool_path:~str = ~""; for arg in args.iter() { - if arg.contains("--android-cross-path=") { - tool_path = arg.replace("--android-cross-path=",""); + if arg.contains("android-cross-path=") { + tool_path = arg.replace("android-cross-path=",""); break; } } @@ -1054,7 +1054,7 @@ fn compile_test_and_save_bitcode(config: &config, props: &TestProps, let aux_dir = aux_output_dir_name(config, testfile); // FIXME (#9639): This needs to handle non-utf8 paths let link_args = ~[~"-L", aux_dir.as_str().unwrap().to_owned()]; - let llvm_args = ~[~"--emit=obj", ~"--crate-type=lib", ~"--save-temps"]; + let llvm_args = ~[~"--emit=obj", ~"--crate-type=lib", ~"-C", ~"save-temps"]; let args = make_compile_args(config, props, link_args + llvm_args, |a, b| ThisFile(make_o_name(a, b)), testfile); |
