diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
| commit | 7b77e0c080a78c2525e286e41b3721393f79fa8f (patch) | |
| tree | 2580c195af5f6405fc74b0415211da14a416c39b /user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | |
| parent | 8c2a854351b6ea35aed27d44baff826f400a0497 (diff) | |
| parent | fd100f124927cd65cf821bd5d538815e81034c1b (diff) | |
| download | packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.gz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.bz2 packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.xz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.33.0
See merge request !205
Diffstat (limited to 'user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch')
| -rw-r--r-- | user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch new file mode 100644 index 000000000..ff49416e0 --- /dev/null +++ b/user/rust/0010-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -0,0 +1,25 @@ +From 4ca0a1760317d3029bfcb0e6253252b926ef92ce Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 01:32:20 +0000 +Subject: [PATCH 10/14] test/sysroot-crates-are-unstable: Fix test when rpath + is disabled + +Without this environment var, the test can't run rustc to find +the sysroot path. +--- + .../run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +index a35174b3c2..9e77070685 100644 +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,2 +1,4 @@ ++-include ../tools.mk ++ + all: +- python2.7 test.py ++ env '$(HOST_RPATH_ENV)' python2.7 test.py +-- +2.21.0 + |