diff options
| author | Antoni Boucher <bouanto@zoho.com> | 2022-06-06 22:04:37 -0400 |
|---|---|---|
| committer | Antoni Boucher <bouanto@zoho.com> | 2022-06-06 22:04:37 -0400 |
| commit | 3fac982e07a859ffedba37865bcc6c508e47893b (patch) | |
| tree | a12775cef836537f2c2dad6a3f32788285c5cdf2 /compiler/rustc_codegen_gcc/rustc_patches | |
| parent | 50b00252aeb77b10db04d65dc9e12ce758def4b5 (diff) | |
| parent | e8dca3e87d164d2806098c462c6ce41301341f68 (diff) | |
| download | rust-3fac982e07a859ffedba37865bcc6c508e47893b.tar.gz rust-3fac982e07a859ffedba37865bcc6c508e47893b.zip | |
Merge commit 'e8dca3e87d164d2806098c462c6ce41301341f68' into sync_from_cg_gcc
Diffstat (limited to 'compiler/rustc_codegen_gcc/rustc_patches')
| -rw-r--r-- | compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch b/compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch new file mode 100644 index 00000000000..59143eac37b --- /dev/null +++ b/compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch @@ -0,0 +1,14 @@ +diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs +index 887d27fd6dca4..2c2239f2b83d1 100644 +--- a/src/tools/compiletest/src/header.rs ++++ b/src/tools/compiletest/src/header.rs +@@ -806,8 +806,8 @@ pub fn make_test_description<R: Read>( + cfg: Option<&str>, + ) -> test::TestDesc { + let mut ignore = false; + #[cfg(not(bootstrap))] +- let ignore_message: Option<String> = None; ++ let ignore_message: Option<&str> = None; + let mut should_fail = false; + + let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some(); |