From d1423d980d13649482299fdd9fe29cc64bc69cc3 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 8 Mar 2026 01:20:41 +0900 Subject: internal/rosa/cmake: bake in CMAKE_INSTALL_LIBDIR There is never a good reason to set this to anything else, and the default value of lib64 breaks everything. This did not manifest on LLVM (which the CMake helper was initially written for) because it did not use this value. Signed-off-by: Ophestra --- internal/rosa/cmake.go | 1 + internal/rosa/zstd.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index 3d8664b1..32baafed 100644 --- a/internal/rosa/cmake.go +++ b/internal/rosa/cmake.go @@ -191,6 +191,7 @@ cmake -G ` + generate + ` \ -DCMAKE_C_COMPILER_TARGET="${ROSA_TRIPLE}" \ -DCMAKE_CXX_COMPILER_TARGET="${ROSA_TRIPLE}" \ -DCMAKE_ASM_COMPILER_TARGET="${ROSA_TRIPLE}" \ + -DCMAKE_INSTALL_LIBDIR=lib \ ` + strings.Join(slices.Collect(func(yield func(string) bool) { for _, v := range attr.Cache { if !yield("-D" + v[0] + "=" + v[1]) { diff --git a/internal/rosa/zstd.go b/internal/rosa/zstd.go index ad288ef2..85a5b173 100644 --- a/internal/rosa/zstd.go +++ b/internal/rosa/zstd.go @@ -16,7 +16,6 @@ func (t Toolchain) newZstd() (pkg.Artifact, string) { Append: []string{"build", "cmake"}, Cache: [][2]string{ {"CMAKE_BUILD_TYPE", "Release"}, - {"CMAKE_INSTALL_LIBDIR", "lib"}, }, }), version } -- cgit v1.3.1