diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-03-08 01:20:41 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-03-08 01:20:41 +0900 |
| commit | d1423d980d13649482299fdd9fe29cc64bc69cc3 (patch) | |
| tree | b880423b9ade17b22879c029c7cb8b235db6e94b /internal | |
| parent | 104da0f66a3510e6ae2fe53f0449c33e864a3de4 (diff) | |
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 <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/rosa/cmake.go | 1 | ||||
| -rw-r--r-- | internal/rosa/zstd.go | 1 |
2 files changed, 1 insertions, 1 deletions
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 } |