Skip to content

Commit 36a94b7

Browse files
authored
[Runner] Work around wrong path of compiler libraries for riscv64 (#402)
1 parent 4d0883a commit 36a94b7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/Runner.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,8 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
555555
# the wrappers before any additional arguments because we want this path to have
556556
# precedence over anything else. In this way for example we avoid libraries
557557
# from `CompilerSupportLibraries_jll` in `${libdir}` are picked up by mistake.
558-
dir = "/opt/$(aatriplet(p))/$(aatriplet(p))/lib" * (nbits(p) == 32 ? "" : "64")
558+
# Note 2: Compiler libraries for riscv64 ended up in `lib/` by mistake.
559+
dir = "/opt/$(aatriplet(p))/$(aatriplet(p))/lib" * (nbits(p) == 32 || arch(p) == "riscv64" ? "" : "64")
559560
append!(flags, ("-L$(dir)", "-Wl,-rpath-link,$(dir)"))
560561
end
561562
if lock_microarchitecture

0 commit comments

Comments
 (0)