Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
cuviper committed Sep 17, 2021
1 parent e4828d5 commit 67edf94
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 67edf94

Please sign in to comment.