nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #89033 - cuviper:sysroot-lib-path, r=Mark-Simulacrum

Browse Source 
Set the library path in sysroot-crates-are-unstable

Most of the `run-make-fulldeps` tests use a make-driven rustc command
that includes `HOST_RPATH_DIR` in the library path, but this particular
test runs from python instead. When the toolchain is built without
`rpath` enabled, we need that library path in the environment so it can
find its own libraries.
This commit is contained in:
Yuki Okushi 2021-09-17 14:09:51 +09:00 committed by GitHub
commit 4d5bcbe957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py
View File

@ -17,6 +17,17 @@ def convert_to_string(s):
return s
def set_ld_lib_path():
var = os.environ.get("LD_LIB_PATH_ENVVAR")
rpath = os.environ.get("HOST_RPATH_DIR")
if var and rpath:
path = os.environ.get(var)
if path:
os.environ[var] = rpath + os.pathsep + path
else:
os.environ[var] = rpath
def exec_command(command, to_input=None):
child = None
if to_input is None:
@ -50,7 +61,9 @@ def get_all_libs(dir_path):
if isfile(join(dir_path, f)) and f.endswith('.rlib') and f not in STABLE_CRATES]
set_ld_lib_path()
sysroot = exec_command([os.environ['RUSTC'], '--print', 'sysroot'])[0].replace('\n', '')
assert sysroot, "Could not read the rustc sysroot!"
libs = get_all_libs(join(sysroot, 'lib/rustlib/{}/lib'.format(os.environ['TARGET'])))
ret = 0