about summary refs log tree commit diff
path: root/compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-03-07 19:57:45 +0100
committerGitHub <noreply@github.com>2023-03-07 19:57:45 +0100
commitc21a640c5a31d64a276cbb76e9e358623ec0ad17 (patch)
tree85da5a3b9a5b48f906bf78c4bd40f7a40072f4ff /compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch
parent63635880f6fe27fc291c7542bc7df03018f694bb (diff)
parent2c0c25dcc1598cd115838e1e1d74d9f32ffd8dbf (diff)
downloadrust-c21a640c5a31d64a276cbb76e9e358623ec0ad17.tar.gz
rust-c21a640c5a31d64a276cbb76e9e358623ec0ad17.zip
Rollup merge of #108783 - antoyo:sync-cg_gcc-2023-03-04, r=cjgillot
Sync rustc_codegen_gcc 2023/03/04

Hi.
This sync all the changes from rustc_codegen_gcc.
Thanks for the review.
Diffstat (limited to 'compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch')
-rw-r--r--compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch b/compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch
deleted file mode 100644
index 59143eac37b..00000000000
--- a/compiler/rustc_codegen_gcc/rustc_patches/compile_test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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();