From b61421e9930f114c25f0af17ffbb07d1ca4189ac Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 20 Oct 2026 20:49:05 +0900 Subject: internal/rosa: remove triple from environment This is cleaner and prepares for cross-compilation support. Signed-off-by: Ophestra --- internal/rosa/package/llvm/package.az | 12 +++++------- internal/rosa/package/make.az | 3 ++- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'internal/rosa/package') diff --git a/internal/rosa/package/llvm/package.az b/internal/rosa/package/llvm/package.az index 05a9d937..631228be 100644 --- a/internal/rosa/package/llvm/package.az +++ b/internal/rosa/package/llvm/package.az @@ -36,8 +36,7 @@ message(NOTICE "${LLVM_VERSION_MAJOR}") // libc++ not yet available "CMAKE_CXX_COMPILER_TARGET": ""; - "LLVM_HOST_TRIPLE": `"${ROSA_TRIPLE}"`; - "LLVM_DEFAULT_TARGET_TRIPLE": `"${ROSA_TRIPLE}"`; + "LLVM_HOST_TRIPLE": triple; "LLVM_ENABLE_RTTI": "ON"; "LLVM_BUILD_LLVM_DYLIB": "ON"; "LLVM_LINK_LLVM_DYLIB": "ON"; @@ -60,15 +59,15 @@ message(NOTICE "${LLVM_VERSION_MAJOR}") postInstall = ` mkdir -p "/work/system/lib/clang/$LLVM_VERSION_MAJOR/lib/" ln -s \ - "../../../${ROSA_TRIPLE}" \ + '../../../`+triple+`' \ "/work/system/lib/clang/$LLVM_VERSION_MAJOR/lib/" ln -s \ "clang_rt.crtbegin-`+linuxArch+`.o" \ - "/work/system/lib/${ROSA_TRIPLE}/crtbeginS.o" + '/work/system/lib/`+triple+`/crtbeginS.o' ln -s \ "clang_rt.crtend-`+linuxArch+`.o" \ - "/work/system/lib/${ROSA_TRIPLE}/crtendS.o" + '/work/system/lib/`+triple+`/crtendS.o' `; }; @@ -95,8 +94,7 @@ package early-runtimes { // libc++ not yet available "CMAKE_CXX_COMPILER_WORKS": "ON"; - "LLVM_HOST_TRIPLE": `"${ROSA_TRIPLE}"`; - "LLVM_DEFAULT_TARGET_TRIPLE": `"${ROSA_TRIPLE}"`; + "LLVM_HOST_TRIPLE": triple; "LLVM_ENABLE_RTTI": "ON"; "LLVM_BUILD_LLVM_DYLIB": "ON"; "LLVM_LINK_LLVM_DYLIB": "ON"; diff --git a/internal/rosa/package/make.az b/internal/rosa/package/make.az index c35dcfa3..771bd20d 100644 --- a/internal/rosa/package/make.az +++ b/internal/rosa/package/make.az @@ -15,7 +15,8 @@ package make { exec = generic { build = `/usr/src/make/configure \ --prefix=/system \ - --build="${ROSA_TRIPLE}" \ + --host= '`+triple+`' \ + --build='`+hostTriple+`' \ --disable-dependency-tracking ./build.sh `; -- cgit v1.3.1