diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:32:50 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-12-08 14:32:50 +0000 |
| commit | 99162e025d3b7323de9deb3992feb4be7fdb2587 (patch) | |
| tree | 748dbd1630f96ba68d77eaee1f2cd708f00c5b4d /user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | |
| parent | 032d4ce8dfbf86b3d18d9d91aec917b5824f1aad (diff) | |
| parent | 3febb3d8330926d97e865c3aeaddff95acef8b83 (diff) | |
| download | packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.gz packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.bz2 packages-99162e025d3b7323de9deb3992feb4be7fdb2587.tar.xz packages-99162e025d3b7323de9deb3992feb4be7fdb2587.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.38.0
See merge request adelie/packages!365
Diffstat (limited to 'user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch')
| -rw-r--r-- | user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch new file mode 100644 index 000000000..63990a199 --- /dev/null +++ b/user/rust/0014-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -0,0 +1,25 @@ +From 45081d6ff61e0f12c1c53545e3bd1b5aed3100b4 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 01:32:20 +0000 +Subject: [PATCH 14/18] 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 + |