summaryrefslogtreecommitdiff
path: root/user/rust/0009-compiletest-Match-suffixed-environments.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/rust/0009-compiletest-Match-suffixed-environments.patch')
-rw-r--r--user/rust/0009-compiletest-Match-suffixed-environments.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/user/rust/0009-compiletest-Match-suffixed-environments.patch b/user/rust/0009-compiletest-Match-suffixed-environments.patch
index 9ca4d9900..0fa811d5a 100644
--- a/user/rust/0009-compiletest-Match-suffixed-environments.patch
+++ b/user/rust/0009-compiletest-Match-suffixed-environments.patch
@@ -1,7 +1,7 @@
-From 0b28aa018f3f64913101495ce9806d356230856e Mon Sep 17 00:00:00 2001
+From 12593754aebecd852a8738524025fa59cf44c429 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Mon, 2 Sep 2019 22:10:10 -0500
-Subject: [PATCH 09/16] compiletest: Match suffixed environments
+Subject: [PATCH 09/18] compiletest: Match suffixed environments
---
src/tools/compiletest/src/header.rs | 2 +-
@@ -9,10 +9,10 @@ Subject: [PATCH 09/16] compiletest: Match suffixed environments
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
-index 52f777db2da..4bf3c1a8527 100644
+index 076ad87c70f..c5141e97a4e 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
-@@ -820,10 +820,10 @@ impl Config {
+@@ -819,10 +819,10 @@ impl Config {
if name == "test" ||
util::matches_os(&self.target, name) || // target
@@ -25,10 +25,10 @@ index 52f777db2da..4bf3c1a8527 100644
match self.compare_mode {
Some(CompareMode::Nll) => name == "compare-mode-nll",
diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
-index 8caf5ca00f5..d23f4edc55d 100644
+index 56ebea7c20f..3a2ee445087 100644
--- a/src/tools/compiletest/src/util.rs
+++ b/src/tools/compiletest/src/util.rs
-@@ -101,8 +101,12 @@ pub fn get_arch(triple: &str) -> &'static str {
+@@ -105,8 +105,12 @@ pub fn get_arch(triple: &str) -> &'static str {
panic!("Cannot determine Architecture from triple");
}