6 files changed, 10 insertions, 21 deletions
diff --git a/internal/rosa/package/go.az b/internal/rosa/package/go.az
index a6b1ff05..8b5abed4 100644
--- a/internal/rosa/package/go.az
+++ b/internal/rosa/package/go.az
@@ -28,7 +28,7 @@ cd /work/system/go/src/
 chmod -R +w ..
 
 sed -i \
-	's,/lib/ld-musl-`+linuxArch+`.so.1,/system/bin/linker,' \
+	's,/lib/ld-musl-`+llvmArch+`.so.1,/system/bin/linker,' \
 	cmd/link/internal/`+arch+`/obj.go
 
 rm \
diff --git a/internal/rosa/package/llvm/package.az b/internal/rosa/package/llvm/package.az
index 8502b558..6b02d6e9 100644
--- a/internal/rosa/package/llvm/package.az
+++ b/internal/rosa/package/llvm/package.az
@@ -21,9 +21,7 @@ package early-builtins {
 	description = "early LLVM runtime: compiler-rt (builtins)";
 	source = llvm-project;
 
-	exclusive = true;
 	libc = false;
-
 	exec = cmake {
 		append = [ "compiler-rt/lib/builtins" ];
 		cache = {
@@ -50,7 +48,6 @@ package early-compiler-rt {
 	description = "early LLVM runtime: compiler-rt";
 	source = llvm-project;
 
-	exclusive = true;
 	libc = false;
 	early = `
 LLVM_VERSION_MAJOR="$(CLICOLOR_FORCE= cmake -P /dev/stdin <<< '
@@ -94,13 +91,6 @@ mkdir -p "/work/system/lib/clang/$LLVM_VERSION_MAJOR/lib/"
 ln -s \
 	'../../../`+triple+`' \
 	"/work/system/lib/clang/$LLVM_VERSION_MAJOR/lib/"
-
-ln -s \
-	"clang_rt.crtbegin-`+linuxArch+`.o" \
-	'/work/system/lib/`+triple+`/crtbeginS.o'
-ln -s \
-	"clang_rt.crtend-`+linuxArch+`.o" \
-	'/work/system/lib/`+triple+`/crtendS.o'
 `;
 	};
 
@@ -118,7 +108,6 @@ package early-runtimes {
 	description = "early LLVM runtimes: libunwind, libcxx, libcxxabi";
 	source = llvm-project;
 
-	exclusive = true;
 	exec = cmake {
 		append = [ "runtimes" ];
 		cache = {
diff --git a/internal/rosa/package/musl/package.az b/internal/rosa/package/musl/package.az
index 91f7b47b..fac7c781 100644
--- a/internal/rosa/package/musl/package.az
+++ b/internal/rosa/package/musl/package.az
@@ -57,7 +57,7 @@ package musl {
 		check = nil;
 		postInstall = `
 mkdir -p /work/system/bin
-COMPAT_LINKER_NAME="ld-musl-` + linuxArch + `.so.1"
+COMPAT_LINKER_NAME="ld-musl-`+llvmArch+`.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}"
diff --git a/internal/rosa/package/python/package.az b/internal/rosa/package/python/package.az
index 657ef546..873f438e 100644
--- a/internal/rosa/package/python/package.az
+++ b/internal/rosa/package/python/package.az
@@ -49,8 +49,8 @@ package python {
 		},
 
 		// _ctypes appears to infer something from the linker name
-		"LDFLAGS=-Wl,--dynamic-linker=/system/lib/" +
-			"ld-musl-" + linuxArch + ".so.1",
+		"LDFLAGS=-Wl,--dynamic-linker=/system/lib/"+
+			"ld-musl-"+llvmArch+".so.1",
 	];
 
 	exec = make {
@@ -120,7 +120,7 @@ package python-early {
 
 		// _ctypes appears to infer something from the linker name
 		"LDFLAGS=-Wl,--dynamic-linker=/system/lib/" +
-			"ld-musl-" + linuxArch + ".so.1",
+			"ld-musl-"+llvmArch+".so.1",
 	];
 
 	exec = make {
diff --git a/internal/rosa/package/tamago.az b/internal/rosa/package/tamago.az
index e0c25719..627823bd 100644
--- a/internal/rosa/package/tamago.az
+++ b/internal/rosa/package/tamago.az
@@ -27,7 +27,7 @@ cd /work/system/tamago/src
 chmod -R +w ..
 
 sed -i \
-	's,/lib/ld-musl-` + linuxArch + `.so.1,/system/bin/linker,' \
+	's,/lib/ld-musl-`+llvmArch+`.so.1,/system/bin/linker,' \
 	cmd/link/internal/` + arch + `/obj.go
 
 rm \
diff --git a/internal/rosa/package/toybox.az b/internal/rosa/package/toybox.az
index c2b8fb53..2c695ad0 100644
--- a/internal/rosa/package/toybox.az
+++ b/internal/rosa/package/toybox.az
@@ -92,11 +92,11 @@ chmod +w /bin/
 ln -rs "$(which bash)" /bin/ || true
 
 if [ -n "${CC+x}" ]; then
-	echo '#!/bin/sh' > '/system/bin/`+linuxArch+`-cc'
-	echo "exec $CC "'"$@"' >> '/system/bin/`+linuxArch+`-cc'
-	chmod +x '/system/bin/`+linuxArch+`-cc'
+	echo '#!/bin/sh' > '/system/bin/`+llvmArch+`-cc'
+	echo "exec $CC "'"$@"' >> '/system/bin/`+llvmArch+`-cc'
+	chmod +x '/system/bin/`+llvmArch+`-cc'
 	unset CC
-	export CROSS_COMPILE=`+linuxArch+`-
+	export CROSS_COMPILE=`+llvmArch+`-
 fi
 
 chmod +w kconfig tests