Skip to content

Commit 4881fc7

Browse files
committed
adding LLVM library link path to run-make
When moving `coverage` tests from `run-make-fulldeps` to `run-make`, some targets failed in CI with an obscure message: failed to execute command: "musl-g++" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m32" "-march=i686" "-Wl,-melf_i386" "-static" "-Wa,-mrelax-relocations=no" "-print-file-name=libstdc++.a" error: No such file or directory (os error 2) The coverage tests include `# needs-profiler-support` and these are the first `run-make` tests to require it (as far as I can tell). There is a special case in `bootstrap` for adding the LLVM library link path, and it applies to `run-make-fulldeps`. This commit adds it for `run-make` as well.
1 parent 3e05c09 commit 4881fc7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bootstrap/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
13991399
// requirement, but the `-L` library path is not propagated across
14001400
// separate compilations. We can add LLVM's library path to the
14011401
// platform-specific environment variable as a workaround.
1402-
if !builder.config.dry_run && suite.ends_with("fulldeps") {
1402+
if !builder.config.dry_run && (suite == "ui-fulldeps" || mode == "run-make") {
14031403
let llvm_libdir = output(Command::new(&llvm_config).arg("--libdir"));
14041404
add_link_lib_path(vec![llvm_libdir.trim().into()], &mut cmd);
14051405
}

0 commit comments

Comments
 (0)