diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:46:04 +0000 |
| commit | 7f660eb77c44872fe454eaf31b543969630670f3 (patch) | |
| tree | c657ba5ee86a0f2021388bd4ff08e3b3a80dae4e /user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | |
| parent | d7c07ebaf84058b90112193bf3953289c280a1a6 (diff) | |
| parent | bdb273539df454bdd85dcfb37f7c0135d33477f8 (diff) | |
| download | packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.gz packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.bz2 packages-7f660eb77c44872fe454eaf31b543969630670f3.tar.xz packages-7f660eb77c44872fe454eaf31b543969630670f3.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.37.0
See merge request adelie/packages!270
Diffstat (limited to 'user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch')
| -rw-r--r-- | user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch new file mode 100644 index 000000000..6123af837 --- /dev/null +++ b/user/rust/0012-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -0,0 +1,25 @@ +From 93835653d45142c17adcf3087d2a8e512053bccf Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 01:32:20 +0000 +Subject: [PATCH 12/16] 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 a35174b3c2a..9e770706857 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 + |