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
diff --git a/src/test/compile-fail/issue-10755.rs b/src/test/compile-fail/issue-10755.rs
index 91afa62..1d8db84 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 47f86e5..aac5eeb 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 a672792..1c19baa 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 b57c359..4a6baca 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 7f130f2..bf9c704 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 328e017..29f0ea6 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 e6094fd..c8e29cf 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 a05face..94a584e 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 0bb8b24..367d3b9 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 ac77c05..2fcb67b 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 04973c2..9863258 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 304d150..b293b9d 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 ff67d35..21f3c0a 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 2c0edb7..b4ca5db 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 abb863f..3b1e730 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 d051ab9..ee9ef7f 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 90956a2..9216829 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 f9a1c30..fc8f752 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 21c2032..b3d2357 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 ed711e2..5acc374 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 0d415a8..dd1cfb0 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 a6f0a42..8ac16bd 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 aab302c..057d2ac 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 6bac417..74c5955 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 da2d4e0..690d624 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 d76551a..0741620 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 a54238e..bb21cb3 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 f71106c..97607af 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 a0551e5..18f3f31 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 5930af1..b73566d 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 143e2de..cc913ad 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 4355b4b..8a3fe3d 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 0a737ff..497351a 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 74064bb..4d9fbe0 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 00e240d..30bbfd7 100644
--- a/src/test/debug-info/issue11600.rs
+++ b/src/test/debug-info/issue11600.rs
@@ -19,7 +19,7 @@
// 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 04ccc59..a426a8e 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 4cc5822..7020293 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 7cb68e9..ffdd88c 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 fbbb66f..d9f16e0 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 f052448..611b71b 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 fa750d2..33138f4 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 2c732f9..7173529 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 f89f677..43e8d61 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 d97fdf6..bd52e2b 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 1eb03e9..4a10f09 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 ef94fd3..b5e2ddb 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 8eed281..2345857 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 4afc8b2..5f35e71 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 79594c5..e0ff04e 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 fc78aba..a9179ed 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 035ebf9..ca7f472 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 7cd5a84..5b7c8b8 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 029a5cd..ac29911 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 29a7de4..e6b16ad 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 f5abe6e..dc22296 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 e8c7812..db154ff 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 fc114a7..3fa5962 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 c263d11..a634eba 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 5e6480f..59b65e1 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 795b9d2..0d3883f 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 4bdc999..0e32058 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 cf693d7..4119549 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 9f0b0ea..e2e9766 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 5ae88b3..bc2570f 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 7bd77d2..85e917c 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 9055487..b21e592 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 6d79d4d..9b4fa3c 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 8d50149..3bc6ce7 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 71685c8..e99a423 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 b56f626..fd94fae 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 b706ad1..01a8233 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 d46d0b1..7040448 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 d7804da..a5c1d0e 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 febd606..bae094c 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 05258d5..429f2e7 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 de46e1a..ef34c50 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 b60f21f..81b0348 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 7647510..19c3310 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 2d571ef..1993fe9 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 c9d577a..fb90fe5c 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 647a6e5..f0383b9 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 1032356..dc586af 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 82ef467..e9b8dc4 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 53287a8..092f7ee 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 6356086..00e0e0f 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 b1224d1..6806e2f 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 7f46657..9a19897 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 7f46657..9a19897 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 a81f19d..6fa5369 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 @@
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 a491fda..af120c9 100644
--- a/src/test/run-make/lto-smoke-c/Makefile
+++ b/src/test/run-make/lto-smoke-c/Makefile
@@ -5,7 +5,7 @@
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 9ab2abc..76106ad 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 6fb7434..38759b2 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 53699e0..ea7fa06 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 fa7d68c..f911124 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) {
