diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go index 3d8664b..32baafe 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 ad288ef..85a5b17 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 }