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/cmake.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'internal/rosa/cmake.go') diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index f9e5e38c..2a262e6e 100644 --- a/internal/rosa/cmake.go +++ b/internal/rosa/cmake.go @@ -62,6 +62,7 @@ func (attr *CMakeHelper) script(t Toolchain, name string) string { if attr == nil { attr = new(CMakeHelper) } + target := t.triple() generate := "Ninja" test := "ninja " + jobsFlagE + " " + loadFlagE + " test" @@ -88,9 +89,9 @@ func (attr *CMakeHelper) script(t Toolchain, name string) string { return ` cmake -G ` + generate + ` \ -Wno-author -Wno-unused-cli \ - -DCMAKE_C_COMPILER_TARGET="${ROSA_TRIPLE}" \ - -DCMAKE_CXX_COMPILER_TARGET="${ROSA_TRIPLE}" \ - -DCMAKE_ASM_COMPILER_TARGET="${ROSA_TRIPLE}" \ + -DCMAKE_C_COMPILER_TARGET='` + target + `' \ + -DCMAKE_CXX_COMPILER_TARGET='` + target + `' \ + -DCMAKE_ASM_COMPILER_TARGET='` + target + `' \ -DCMAKE_INSTALL_LIBDIR=lib \ ` + strings.Join(slices.Collect(func(yield func(string) bool) { for _, v := range cache { -- cgit v1.3.1