diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index e147572..fd3430f 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -255,10 +255,10 @@ ln -s \ "${ROSA_INSTALL_PREFIX}/lib/clang/21/lib/" ln -s \ - "clang_rt.crtbegin-$(uname -m).o" \ + "clang_rt.crtbegin-` + linuxArch() + `.o" \ "${ROSA_INSTALL_PREFIX}/lib/${ROSA_TRIPLE}/crtbeginS.o" ln -s \ - "clang_rt.crtend-$(uname -m).o" \ + "clang_rt.crtend-` + linuxArch() + `.o" \ "${ROSA_INSTALL_PREFIX}/lib/${ROSA_TRIPLE}/crtendS.o" `, }) diff --git a/internal/rosa/musl.go b/internal/rosa/musl.go index bc4be30..5b9c1e1 100644 --- a/internal/rosa/musl.go +++ b/internal/rosa/musl.go @@ -30,7 +30,7 @@ func (t Toolchain) NewMusl(attr *MuslAttr) pkg.Artifact { target := "install" script := ` mkdir -p /work/system/bin -COMPAT_LINKER_NAME="ld-musl-$(uname -m).so.1" +COMPAT_LINKER_NAME="ld-musl-` + linuxArch() + `.so.1" ln -vs ../lib/libc.so /work/system/bin/linker ln -vs ../lib/libc.so /work/system/bin/ldd ln -vs libc.so "/work/system/lib/${COMPAT_LINKER_NAME}"