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/test | |
| parent | 2780d9dd5410a5c093f27eacfb1684ddbfcb4632 (diff) | |
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/test')
94 files changed, 95 insertions, 95 deletions
diff --git a/src/test/compile-fail/issue-10755.rs b/src/test/compile-fail/issue-10755.rs index 91afa62b58c..1d8db84ab13 100644 --- a/src/test/compile-fail/issue-10755.rs +++ b/src/test/compile-fail/issue-10755.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: --linker=llllll +// compile-flags: -C linker=llllll // error-pattern: the linker `llllll` fn main() { diff --git a/src/test/compile-fail/issue-11154.rs b/src/test/compile-fail/issue-11154.rs index 47f86e52eae..aac5eebaf4a 100644 --- a/src/test/compile-fail/issue-11154.rs +++ b/src/test/compile-fail/issue-11154.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: -Z lto -Z prefer-dynamic +// compile-flags: -Z lto -C prefer-dynamic // error-pattern: cannot prefer dynamic linking diff --git a/src/test/debug-info/basic-types-metadata.rs b/src/test/debug-info/basic-types-metadata.rs index a67279254de..1c19baa4d8e 100644 --- a/src/test/debug-info/basic-types-metadata.rs +++ b/src/test/debug-info/basic-types-metadata.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/basic-types.rs b/src/test/debug-info/basic-types.rs index b57c359046a..4a6bacad98f 100644 --- a/src/test/debug-info/basic-types.rs +++ b/src/test/debug-info/basic-types.rs @@ -16,7 +16,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/borrowed-basic.rs b/src/test/debug-info/borrowed-basic.rs index 7f130f212e2..bf9c70488b0 100644 --- a/src/test/debug-info/borrowed-basic.rs +++ b/src/test/debug-info/borrowed-basic.rs @@ -13,7 +13,7 @@ // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only // its numerical value. -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/borrowed-c-style-enum.rs b/src/test/debug-info/borrowed-c-style-enum.rs index 328e0176a91..29f0ea61ca7 100644 --- a/src/test/debug-info/borrowed-c-style-enum.rs +++ b/src/test/debug-info/borrowed-c-style-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/borrowed-enum.rs b/src/test/debug-info/borrowed-enum.rs index e6094fdef9f..c8e29cfddb0 100644 --- a/src/test/debug-info/borrowed-enum.rs +++ b/src/test/debug-info/borrowed-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/borrowed-managed-basic.rs b/src/test/debug-info/borrowed-managed-basic.rs index a05face4c5e..94a584efe94 100644 --- a/src/test/debug-info/borrowed-managed-basic.rs +++ b/src/test/debug-info/borrowed-managed-basic.rs @@ -15,7 +15,7 @@ // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only // its numerical value. -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/borrowed-struct.rs b/src/test/debug-info/borrowed-struct.rs index 0bb8b247e59..367d3b9a6da 100644 --- a/src/test/debug-info/borrowed-struct.rs +++ b/src/test/debug-info/borrowed-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/borrowed-tuple.rs b/src/test/debug-info/borrowed-tuple.rs index ac77c05b832..2fcb67baecd 100644 --- a/src/test/debug-info/borrowed-tuple.rs +++ b/src/test/debug-info/borrowed-tuple.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/borrowed-unique-basic.rs b/src/test/debug-info/borrowed-unique-basic.rs index 04973c20799..9863258930a 100644 --- a/src/test/debug-info/borrowed-unique-basic.rs +++ b/src/test/debug-info/borrowed-unique-basic.rs @@ -13,7 +13,7 @@ // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only // its numerical value. -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/box.rs b/src/test/debug-info/box.rs index 304d150d57e..b293b9d2545 100644 --- a/src/test/debug-info/box.rs +++ b/src/test/debug-info/box.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/boxed-struct.rs b/src/test/debug-info/boxed-struct.rs index ff67d35a9cd..21f3c0a99f7 100644 --- a/src/test/debug-info/boxed-struct.rs +++ b/src/test/debug-info/boxed-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/boxed-vec.rs b/src/test/debug-info/boxed-vec.rs index 2c0edb783f8..b4ca5dbeabe 100644 --- a/src/test/debug-info/boxed-vec.rs +++ b/src/test/debug-info/boxed-vec.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/by-value-non-immediate-argument.rs b/src/test/debug-info/by-value-non-immediate-argument.rs index abb863f6b9e..3b1e730ff9e 100644 --- a/src/test/debug-info/by-value-non-immediate-argument.rs +++ b/src/test/debug-info/by-value-non-immediate-argument.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/by-value-self-argument-in-trait-impl.rs b/src/test/debug-info/by-value-self-argument-in-trait-impl.rs index d051ab9db93..ee9ef7f2f0f 100644 --- a/src/test/debug-info/by-value-self-argument-in-trait-impl.rs +++ b/src/test/debug-info/by-value-self-argument-in-trait-impl.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/c-style-enum-in-composite.rs b/src/test/debug-info/c-style-enum-in-composite.rs index 90956a26413..92168292f93 100644 --- a/src/test/debug-info/c-style-enum-in-composite.rs +++ b/src/test/debug-info/c-style-enum-in-composite.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/c-style-enum.rs b/src/test/debug-info/c-style-enum.rs index f9a1c30103c..fc8f752936f 100644 --- a/src/test/debug-info/c-style-enum.rs +++ b/src/test/debug-info/c-style-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/closure-in-generic-function.rs b/src/test/debug-info/closure-in-generic-function.rs index 21c20325e3c..b3d2357a63c 100644 --- a/src/test/debug-info/closure-in-generic-function.rs +++ b/src/test/debug-info/closure-in-generic-function.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/destructured-fn-argument.rs b/src/test/debug-info/destructured-fn-argument.rs index ed711e2ca0b..5acc3748964 100644 --- a/src/test/debug-info/destructured-fn-argument.rs +++ b/src/test/debug-info/destructured-fn-argument.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/destructured-local.rs b/src/test/debug-info/destructured-local.rs index 0d415a85172..dd1cfb036f5 100644 --- a/src/test/debug-info/destructured-local.rs +++ b/src/test/debug-info/destructured-local.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/evec-in-struct.rs b/src/test/debug-info/evec-in-struct.rs index a6f0a42bd30..8ac16bdd2dd 100644 --- a/src/test/debug-info/evec-in-struct.rs +++ b/src/test/debug-info/evec-in-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/function-arg-initialization.rs b/src/test/debug-info/function-arg-initialization.rs index aab302c72c5..057d2ac21b5 100644 --- a/src/test/debug-info/function-arg-initialization.rs +++ b/src/test/debug-info/function-arg-initialization.rs @@ -17,7 +17,7 @@ // before the arguments have been properly loaded when setting the breakpoint via the function name. // Therefore the setup here sets them using line numbers (so be careful when changing this file). -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:break function-arg-initialization.rs:139 // debugger:break function-arg-initialization.rs:154 diff --git a/src/test/debug-info/function-arguments.rs b/src/test/debug-info/function-arguments.rs index 6bac417f54e..74c59550e0b 100644 --- a/src/test/debug-info/function-arguments.rs +++ b/src/test/debug-info/function-arguments.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/function-prologue-stepping-no-split-stack.rs b/src/test/debug-info/function-prologue-stepping-no-split-stack.rs index da2d4e09fc6..690d6248cea 100644 --- a/src/test/debug-info/function-prologue-stepping-no-split-stack.rs +++ b/src/test/debug-info/function-prologue-stepping-no-split-stack.rs @@ -16,7 +16,7 @@ // consequence, and as opposed to regular Rust functions, we can set the breakpoints via the // function name (and don't have to fall back on using line numbers). -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak immediate_args // debugger:rbreak binding diff --git a/src/test/debug-info/generic-function.rs b/src/test/debug-info/generic-function.rs index d76551a212e..0741620fd20 100644 --- a/src/test/debug-info/generic-function.rs +++ b/src/test/debug-info/generic-function.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/generic-functions-nested.rs b/src/test/debug-info/generic-functions-nested.rs index a54238e981a..bb21cb38132 100644 --- a/src/test/debug-info/generic-functions-nested.rs +++ b/src/test/debug-info/generic-functions-nested.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/generic-method-on-generic-struct.rs b/src/test/debug-info/generic-method-on-generic-struct.rs index f71106cacb1..97607af4cb3 100644 --- a/src/test/debug-info/generic-method-on-generic-struct.rs +++ b/src/test/debug-info/generic-method-on-generic-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/generic-static-method-on-struct-and-enum.rs b/src/test/debug-info/generic-static-method-on-struct-and-enum.rs index a0551e570c7..18f3f3109d5 100644 --- a/src/test/debug-info/generic-static-method-on-struct-and-enum.rs +++ b/src/test/debug-info/generic-static-method-on-struct-and-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/generic-struct-style-enum.rs b/src/test/debug-info/generic-struct-style-enum.rs index 5930af11567..b73566dad9e 100644 --- a/src/test/debug-info/generic-struct-style-enum.rs +++ b/src/test/debug-info/generic-struct-style-enum.rs @@ -11,7 +11,7 @@ // xfail-tidy-linelength // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print union on // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/generic-struct.rs b/src/test/debug-info/generic-struct.rs index 143e2ded193..cc913ad8c94 100644 --- a/src/test/debug-info/generic-struct.rs +++ b/src/test/debug-info/generic-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/generic-trait-generic-static-default-method.rs b/src/test/debug-info/generic-trait-generic-static-default-method.rs index 4355b4b98fe..8a3fe3d1c2c 100644 --- a/src/test/debug-info/generic-trait-generic-static-default-method.rs +++ b/src/test/debug-info/generic-trait-generic-static-default-method.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/generic-tuple-style-enum.rs b/src/test/debug-info/generic-tuple-style-enum.rs index 0a737ffe073..497351ac51f 100644 --- a/src/test/debug-info/generic-tuple-style-enum.rs +++ b/src/test/debug-info/generic-tuple-style-enum.rs @@ -11,7 +11,7 @@ // xfail-tidy-linelength // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print union on // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/include_string.rs b/src/test/debug-info/include_string.rs index 74064bb5782..4d9fbe083ea 100644 --- a/src/test/debug-info/include_string.rs +++ b/src/test/debug-info/include_string.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/issue11600.rs b/src/test/debug-info/issue11600.rs index 00e240d147c..30bbfd72c36 100644 --- a/src/test/debug-info/issue11600.rs +++ b/src/test/debug-info/issue11600.rs @@ -19,7 +19,7 @@ fn main() { // This test case checks whether compile unit names are set correctly, so that the correct default // source file can be found. -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:list // check:1[...]fn main() { // check:2[...]let args : ~[~str] = ::std::os::args(); diff --git a/src/test/debug-info/lexical-scope-in-for-loop.rs b/src/test/debug-info/lexical-scope-in-for-loop.rs index 04ccc59250d..a426a8e3f6c 100644 --- a/src/test/debug-info/lexical-scope-in-for-loop.rs +++ b/src/test/debug-info/lexical-scope-in-for-loop.rs @@ -11,7 +11,7 @@ // xfail-win32 // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scope-in-if.rs b/src/test/debug-info/lexical-scope-in-if.rs index 4cc58229ad0..7020293a3ef 100644 --- a/src/test/debug-info/lexical-scope-in-if.rs +++ b/src/test/debug-info/lexical-scope-in-if.rs @@ -11,7 +11,7 @@ // xfail-win32 // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scope-in-match.rs b/src/test/debug-info/lexical-scope-in-match.rs index 7cb68e9890d..ffdd88cfa59 100644 --- a/src/test/debug-info/lexical-scope-in-match.rs +++ b/src/test/debug-info/lexical-scope-in-match.rs @@ -11,7 +11,7 @@ // xfail-win32 // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scope-in-parameterless-closure.rs b/src/test/debug-info/lexical-scope-in-parameterless-closure.rs index fbbb66f2904..d9f16e00f97 100644 --- a/src/test/debug-info/lexical-scope-in-parameterless-closure.rs +++ b/src/test/debug-info/lexical-scope-in-parameterless-closure.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z debug-info +// compile-flags:-g // debugger:run // Nothing to do here really, just make sure it compiles. See issue #8513. diff --git a/src/test/debug-info/lexical-scope-in-stack-closure.rs b/src/test/debug-info/lexical-scope-in-stack-closure.rs index f052448c146..611b71b5c25 100644 --- a/src/test/debug-info/lexical-scope-in-stack-closure.rs +++ b/src/test/debug-info/lexical-scope-in-stack-closure.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scope-in-unconditional-loop.rs b/src/test/debug-info/lexical-scope-in-unconditional-loop.rs index fa750d247b1..33138f4cc2b 100644 --- a/src/test/debug-info/lexical-scope-in-unconditional-loop.rs +++ b/src/test/debug-info/lexical-scope-in-unconditional-loop.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scope-in-unique-closure.rs b/src/test/debug-info/lexical-scope-in-unique-closure.rs index 2c732f9f850..7173529bc51 100644 --- a/src/test/debug-info/lexical-scope-in-unique-closure.rs +++ b/src/test/debug-info/lexical-scope-in-unique-closure.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scope-in-while.rs b/src/test/debug-info/lexical-scope-in-while.rs index f89f677291a..43e8d61b0bb 100644 --- a/src/test/debug-info/lexical-scope-in-while.rs +++ b/src/test/debug-info/lexical-scope-in-while.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scope-with-macro.rs b/src/test/debug-info/lexical-scope-with-macro.rs index d97fdf66089..bd52e2ba65d 100644 --- a/src/test/debug-info/lexical-scope-with-macro.rs +++ b/src/test/debug-info/lexical-scope-with-macro.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/lexical-scopes-in-block-expression.rs b/src/test/debug-info/lexical-scopes-in-block-expression.rs index 1eb03e95f8f..4a10f09177b 100644 --- a/src/test/debug-info/lexical-scopes-in-block-expression.rs +++ b/src/test/debug-info/lexical-scopes-in-block-expression.rs @@ -11,7 +11,7 @@ // xfail-win32 // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/managed-enum.rs b/src/test/debug-info/managed-enum.rs index ef94fd3e331..b5e2ddb8959 100644 --- a/src/test/debug-info/managed-enum.rs +++ b/src/test/debug-info/managed-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/managed-pointer-within-unique-vec.rs b/src/test/debug-info/managed-pointer-within-unique-vec.rs index 8eed28170c5..2345857e392 100644 --- a/src/test/debug-info/managed-pointer-within-unique-vec.rs +++ b/src/test/debug-info/managed-pointer-within-unique-vec.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/managed-pointer-within-unique.rs b/src/test/debug-info/managed-pointer-within-unique.rs index 4afc8b235ed..5f35e712d7c 100644 --- a/src/test/debug-info/managed-pointer-within-unique.rs +++ b/src/test/debug-info/managed-pointer-within-unique.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/method-on-enum.rs b/src/test/debug-info/method-on-enum.rs index 79594c5d389..e0ff04ed0bc 100644 --- a/src/test/debug-info/method-on-enum.rs +++ b/src/test/debug-info/method-on-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/method-on-generic-struct.rs b/src/test/debug-info/method-on-generic-struct.rs index fc78aba707f..a9179ed395f 100644 --- a/src/test/debug-info/method-on-generic-struct.rs +++ b/src/test/debug-info/method-on-generic-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/method-on-struct.rs b/src/test/debug-info/method-on-struct.rs index 035ebf9caeb..ca7f472f977 100644 --- a/src/test/debug-info/method-on-struct.rs +++ b/src/test/debug-info/method-on-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/method-on-trait.rs b/src/test/debug-info/method-on-trait.rs index 7cd5a845cba..5b7c8b85623 100644 --- a/src/test/debug-info/method-on-trait.rs +++ b/src/test/debug-info/method-on-trait.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/method-on-tuple-struct.rs b/src/test/debug-info/method-on-tuple-struct.rs index 029a5cd4c91..ac2991171c6 100644 --- a/src/test/debug-info/method-on-tuple-struct.rs +++ b/src/test/debug-info/method-on-tuple-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/multiple-functions-equal-var-names.rs b/src/test/debug-info/multiple-functions-equal-var-names.rs index 29a7de4a316..e6b16adc386 100644 --- a/src/test/debug-info/multiple-functions-equal-var-names.rs +++ b/src/test/debug-info/multiple-functions-equal-var-names.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/multiple-functions.rs b/src/test/debug-info/multiple-functions.rs index f5abe6e249d..dc22296baad 100644 --- a/src/test/debug-info/multiple-functions.rs +++ b/src/test/debug-info/multiple-functions.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/name-shadowing-and-scope-nesting.rs b/src/test/debug-info/name-shadowing-and-scope-nesting.rs index e8c7812eb09..db154ff599c 100644 --- a/src/test/debug-info/name-shadowing-and-scope-nesting.rs +++ b/src/test/debug-info/name-shadowing-and-scope-nesting.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/nil-enum.rs b/src/test/debug-info/nil-enum.rs index fc114a79ad6..3fa596285c6 100644 --- a/src/test/debug-info/nil-enum.rs +++ b/src/test/debug-info/nil-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/option-like-enum.rs b/src/test/debug-info/option-like-enum.rs index c263d115509..a634eba2850 100644 --- a/src/test/debug-info/option-like-enum.rs +++ b/src/test/debug-info/option-like-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/packed-struct-with-destructor.rs b/src/test/debug-info/packed-struct-with-destructor.rs index 5e6480fa8c5..59b65e1119c 100644 --- a/src/test/debug-info/packed-struct-with-destructor.rs +++ b/src/test/debug-info/packed-struct-with-destructor.rs @@ -11,7 +11,7 @@ // xfail-tidy-linelength // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/packed-struct.rs b/src/test/debug-info/packed-struct.rs index 795b9d275dd..0d3883f1102 100644 --- a/src/test/debug-info/packed-struct.rs +++ b/src/test/debug-info/packed-struct.rs @@ -11,7 +11,7 @@ // xfail-tidy-linelength // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/recursive-enum.rs b/src/test/debug-info/recursive-enum.rs index 4bdc9994c43..0e3205838de 100644 --- a/src/test/debug-info/recursive-enum.rs +++ b/src/test/debug-info/recursive-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:run // Test whether compiling a recursive enum definition crashes debug info generation. The test case diff --git a/src/test/debug-info/recursive-struct.rs b/src/test/debug-info/recursive-struct.rs index cf693d7e356..4119549010c 100644 --- a/src/test/debug-info/recursive-struct.rs +++ b/src/test/debug-info/recursive-struct.rs @@ -12,7 +12,7 @@ #[feature(managed_boxes)]; -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/self-in-default-method.rs b/src/test/debug-info/self-in-default-method.rs index 9f0b0ea8414..e2e9766a4b5 100644 --- a/src/test/debug-info/self-in-default-method.rs +++ b/src/test/debug-info/self-in-default-method.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/self-in-generic-default-method.rs b/src/test/debug-info/self-in-generic-default-method.rs index 5ae88b3d0ce..bc2570f1a37 100644 --- a/src/test/debug-info/self-in-generic-default-method.rs +++ b/src/test/debug-info/self-in-generic-default-method.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/shadowed-argument.rs b/src/test/debug-info/shadowed-argument.rs index 7bd77d22a2f..85e917c091c 100644 --- a/src/test/debug-info/shadowed-argument.rs +++ b/src/test/debug-info/shadowed-argument.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/shadowed-variable.rs b/src/test/debug-info/shadowed-variable.rs index 9055487aaa7..b21e59283ad 100644 --- a/src/test/debug-info/shadowed-variable.rs +++ b/src/test/debug-info/shadowed-variable.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/simple-lexical-scope.rs b/src/test/debug-info/simple-lexical-scope.rs index 6d79d4d813f..9b4fa3c5c2a 100644 --- a/src/test/debug-info/simple-lexical-scope.rs +++ b/src/test/debug-info/simple-lexical-scope.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/simple-struct.rs b/src/test/debug-info/simple-struct.rs index 8d50149a284..3bc6ce70a71 100644 --- a/src/test/debug-info/simple-struct.rs +++ b/src/test/debug-info/simple-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/simple-tuple.rs b/src/test/debug-info/simple-tuple.rs index 71685c80682..e99a4234df0 100644 --- a/src/test/debug-info/simple-tuple.rs +++ b/src/test/debug-info/simple-tuple.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/static-method-on-struct-and-enum.rs b/src/test/debug-info/static-method-on-struct-and-enum.rs index b56f6267a8d..fd94faeb7c2 100644 --- a/src/test/debug-info/static-method-on-struct-and-enum.rs +++ b/src/test/debug-info/static-method-on-struct-and-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/struct-in-enum.rs b/src/test/debug-info/struct-in-enum.rs index b706ad1c38c..01a8233a96e 100644 --- a/src/test/debug-info/struct-in-enum.rs +++ b/src/test/debug-info/struct-in-enum.rs @@ -11,7 +11,7 @@ // xfail-tidy-linelength // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print union on // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/struct-in-struct.rs b/src/test/debug-info/struct-in-struct.rs index d46d0b1cd88..7040448cb35 100644 --- a/src/test/debug-info/struct-in-struct.rs +++ b/src/test/debug-info/struct-in-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/struct-style-enum.rs b/src/test/debug-info/struct-style-enum.rs index d7804da7894..a5c1d0e81c6 100644 --- a/src/test/debug-info/struct-style-enum.rs +++ b/src/test/debug-info/struct-style-enum.rs @@ -11,7 +11,7 @@ // xfail-tidy-linelength // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print union on // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/struct-with-destructor.rs b/src/test/debug-info/struct-with-destructor.rs index febd6061468..bae094cefd7 100644 --- a/src/test/debug-info/struct-with-destructor.rs +++ b/src/test/debug-info/struct-with-destructor.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/trait-generic-static-default-method.rs b/src/test/debug-info/trait-generic-static-default-method.rs index 05258d53586..429f2e77deb 100644 --- a/src/test/debug-info/trait-generic-static-default-method.rs +++ b/src/test/debug-info/trait-generic-static-default-method.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/trait-pointers.rs b/src/test/debug-info/trait-pointers.rs index de46e1aea58..ef34c50bbf7 100644 --- a/src/test/debug-info/trait-pointers.rs +++ b/src/test/debug-info/trait-pointers.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:run #[allow(unused_variable)]; diff --git a/src/test/debug-info/tuple-in-struct.rs b/src/test/debug-info/tuple-in-struct.rs index b60f21fe6ce..81b0348bed0 100644 --- a/src/test/debug-info/tuple-in-struct.rs +++ b/src/test/debug-info/tuple-in-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/tuple-in-tuple.rs b/src/test/debug-info/tuple-in-tuple.rs index 76475109382..19c331079b9 100644 --- a/src/test/debug-info/tuple-in-tuple.rs +++ b/src/test/debug-info/tuple-in-tuple.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/tuple-struct.rs b/src/test/debug-info/tuple-struct.rs index 2d571ef4160..1993fe91b73 100644 --- a/src/test/debug-info/tuple-struct.rs +++ b/src/test/debug-info/tuple-struct.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/tuple-style-enum.rs b/src/test/debug-info/tuple-style-enum.rs index c9d577a2491..fb90fe5c138 100644 --- a/src/test/debug-info/tuple-style-enum.rs +++ b/src/test/debug-info/tuple-style-enum.rs @@ -11,7 +11,7 @@ // xfail-tidy-linelength // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print union on // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/unique-enum.rs b/src/test/debug-info/unique-enum.rs index 647a6e55f98..f0383b97dd0 100644 --- a/src/test/debug-info/unique-enum.rs +++ b/src/test/debug-info/unique-enum.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/var-captured-in-nested-closure.rs b/src/test/debug-info/var-captured-in-nested-closure.rs index 1032356689f..dc586afaa24 100644 --- a/src/test/debug-info/var-captured-in-nested-closure.rs +++ b/src/test/debug-info/var-captured-in-nested-closure.rs @@ -11,7 +11,7 @@ // xfail-win32: FIXME #10474 // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/var-captured-in-sendable-closure.rs b/src/test/debug-info/var-captured-in-sendable-closure.rs index 82ef467925a..e9b8dc46625 100644 --- a/src/test/debug-info/var-captured-in-sendable-closure.rs +++ b/src/test/debug-info/var-captured-in-sendable-closure.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/var-captured-in-stack-closure.rs b/src/test/debug-info/var-captured-in-stack-closure.rs index 53287a8511b..092f7ee443e 100644 --- a/src/test/debug-info/var-captured-in-stack-closure.rs +++ b/src/test/debug-info/var-captured-in-stack-closure.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:rbreak zzz // debugger:run // debugger:finish diff --git a/src/test/debug-info/vec-slices.rs b/src/test/debug-info/vec-slices.rs index 635608604b1..00e0e0fa783 100644 --- a/src/test/debug-info/vec-slices.rs +++ b/src/test/debug-info/vec-slices.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/debug-info/vec.rs b/src/test/debug-info/vec.rs index b1224d14dc4..6806e2f2b3d 100644 --- a/src/test/debug-info/vec.rs +++ b/src/test/debug-info/vec.rs @@ -10,7 +10,7 @@ // xfail-android: FIXME(#10381) -// compile-flags:-Z extra-debug-info +// compile-flags:-g // debugger:set print pretty off // debugger:rbreak zzz // debugger:run diff --git a/src/test/run-make/bootstrap-from-c-with-green/Makefile b/src/test/run-make/bootstrap-from-c-with-green/Makefile index 7f466573da7..9a198977aa3 100644 --- a/src/test/run-make/bootstrap-from-c-with-green/Makefile +++ b/src/test/run-make/bootstrap-from-c-with-green/Makefile @@ -1,7 +1,7 @@ -include ../tools.mk all: - $(RUSTC) lib.rs -Z gen-crate-map + $(RUSTC) lib.rs -C gen-crate-map ln -nsf $(call DYLIB,boot-*) $(call DYLIB,boot) $(CC) main.c -o $(call RUN,main) -lboot -Wl,-rpath,$(TMPDIR) $(call RUN,main) diff --git a/src/test/run-make/bootstrap-from-c-with-native/Makefile b/src/test/run-make/bootstrap-from-c-with-native/Makefile index 7f466573da7..9a198977aa3 100644 --- a/src/test/run-make/bootstrap-from-c-with-native/Makefile +++ b/src/test/run-make/bootstrap-from-c-with-native/Makefile @@ -1,7 +1,7 @@ -include ../tools.mk all: - $(RUSTC) lib.rs -Z gen-crate-map + $(RUSTC) lib.rs -C gen-crate-map ln -nsf $(call DYLIB,boot-*) $(call DYLIB,boot) $(CC) main.c -o $(call RUN,main) -lboot -Wl,-rpath,$(TMPDIR) $(call RUN,main) diff --git a/src/test/run-make/c-link-to-rust-staticlib/Makefile b/src/test/run-make/c-link-to-rust-staticlib/Makefile index a81f19d6eb3..6fa5369015b 100644 --- a/src/test/run-make/c-link-to-rust-staticlib/Makefile +++ b/src/test/run-make/c-link-to-rust-staticlib/Makefile @@ -5,9 +5,9 @@ ifneq ($(shell uname),Darwin) endif all: - $(RUSTC) foo.rs -Z gen-crate-map + $(RUSTC) foo.rs -C gen-crate-map ln -s $(call STATICLIB,foo-*) $(call STATICLIB,foo) - $(CC) bar.c -lfoo -o $(call RUN,bar) $(EXTRAFLAGS) -lstdc++ + $(CC) bar.c -lfoo -o $(call RUN,bar) $(EXTRAFLAGS) -lstdc++ $(call RUN,bar) rm $(call STATICLIB,foo*) $(call RUN,bar) diff --git a/src/test/run-make/lto-smoke-c/Makefile b/src/test/run-make/lto-smoke-c/Makefile index a491fda7dc2..af120c9baeb 100644 --- a/src/test/run-make/lto-smoke-c/Makefile +++ b/src/test/run-make/lto-smoke-c/Makefile @@ -5,7 +5,7 @@ ifneq ($(shell uname),Darwin) endif all: - $(RUSTC) foo.rs -Z gen-crate-map -Z lto + $(RUSTC) foo.rs -C gen-crate-map -Z lto ln -s $(call STATICLIB,foo-*) $(call STATICLIB,foo) $(CC) bar.c -lfoo -o $(call RUN,bar) $(EXTRAFLAGS) -lstdc++ $(call RUN,bar) diff --git a/src/test/run-make/mixing-deps/Makefile b/src/test/run-make/mixing-deps/Makefile index 9ab2abca729..76106ada144 100644 --- a/src/test/run-make/mixing-deps/Makefile +++ b/src/test/run-make/mixing-deps/Makefile @@ -2,6 +2,6 @@ all: $(RUSTC) both.rs - $(RUSTC) dylib.rs -Z prefer-dynamic + $(RUSTC) dylib.rs -C prefer-dynamic $(RUSTC) prog.rs $(call RUN,prog) diff --git a/src/test/run-make/prefer-dylib/Makefile b/src/test/run-make/prefer-dylib/Makefile index 6fb7434e68a..38759b2f524 100644 --- a/src/test/run-make/prefer-dylib/Makefile +++ b/src/test/run-make/prefer-dylib/Makefile @@ -2,7 +2,7 @@ all: $(RUSTC) bar.rs --crate-type=dylib --crate-type=rlib - $(RUSTC) foo.rs -Z prefer-dynamic + $(RUSTC) foo.rs -C prefer-dynamic $(call RUN,foo) rm $(TMPDIR)/*bar* $(call FAILS,foo) diff --git a/src/test/run-make/prune-link-args/Makefile b/src/test/run-make/prune-link-args/Makefile index 53699e0dd98..ea7fa06f5ef 100644 --- a/src/test/run-make/prune-link-args/Makefile +++ b/src/test/run-make/prune-link-args/Makefile @@ -1,6 +1,6 @@ -include ../tools.mk # Notice the space in the end, this emulates the output of pkg-config -RUSTC_FLAGS = --link-args "-lc " +RUSTC_FLAGS = -C link-args="-lc " all: $(RUSTC) $(RUSTC_FLAGS) empty.rs diff --git a/src/test/run-pass/issue-7712.rs b/src/test/run-pass/issue-7712.rs index fa7d68cf921..f91112416e3 100644 --- a/src/test/run-pass/issue-7712.rs +++ b/src/test/run-pass/issue-7712.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags:-Z debug-info +// compile-flags:-g pub trait TraitWithDefaultMethod { fn method(self) { |