From 7f3a62b17b3d72746c8c839baca851bac7544180 Mon Sep 17 00:00:00 2001 From: aditijannu Date: Tue, 26 Mar 2024 14:55:06 +0100 Subject: [PATCH] Fix run make tests when it can't find dynamically linked librustc_driver. --- src/tools/compiletest/src/runtest.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index bd2f65925bb96..050a5e14558b8 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3784,6 +3784,7 @@ impl<'test> TestCx<'test> { .env("TMPDIR", &tmpdir) .env("LD_LIB_PATH_ENVVAR", dylib_env_var()) .env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path)) + .env("LD_LIBRARY_PATH", cwd.join(&self.config.compile_lib_path)) .env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path)) .env("LLVM_COMPONENTS", &self.config.llvm_components) // We for sure don't want these tests to run in parallel, so make @@ -3838,6 +3839,7 @@ impl<'test> TestCx<'test> { .env("RUSTC", cwd.join(&self.config.rustc_path)) .env("TMPDIR", &tmpdir) .env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path)) + .env("LD_LIBRARY_PATH", cwd.join(&self.config.compile_lib_path)) .env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path)) .env("LLVM_COMPONENTS", &self.config.llvm_components) // We for sure don't want these tests to run in parallel, so make