From 36a94b7dd1b9dd3922715ccd1e74a6c2746a13a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?=
 <765740+giordano@users.noreply.github.com>
Date: Mon, 6 Jan 2025 23:01:37 +0100
Subject: [PATCH] [Runner] Work around wrong path of compiler libraries for
 riscv64 (#402)

---
 src/Runner.jl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Runner.jl b/src/Runner.jl
index 54a1a18a..be497e02 100644
--- a/src/Runner.jl
+++ b/src/Runner.jl
@@ -555,7 +555,8 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
             # the wrappers before any additional arguments because we want this path to have
             # precedence over anything else.  In this way for example we avoid libraries
             # from `CompilerSupportLibraries_jll` in `${libdir}` are picked up by mistake.
-            dir = "/opt/$(aatriplet(p))/$(aatriplet(p))/lib" * (nbits(p) == 32 ? "" : "64")
+            # Note 2: Compiler libraries for riscv64 ended up in `lib/` by mistake.
+            dir = "/opt/$(aatriplet(p))/$(aatriplet(p))/lib" * (nbits(p) == 32 || arch(p) == "riscv64" ? "" : "64")
             append!(flags, ("-L$(dir)", "-Wl,-rpath-link,$(dir)"))
         end
         if lock_microarchitecture