diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 6177a716..aac950e6 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -50,8 +50,17 @@ func (t Toolchain) newLLVM() (pkg.Artifact, string) { {"LLVM_HOST_TRIPLE", `"${ROSA_TRIPLE}"`}, {"LLVM_DEFAULT_TARGET_TRIPLE", `"${ROSA_TRIPLE}"`}, - {"LLVM_ENABLE_PROJECTS", "'clang;lld;libclc'"}, - {"LLVM_ENABLE_RUNTIMES", "'compiler-rt;libcxx;libcxxabi;libunwind'"}, + {"LLVM_ENABLE_PROJECTS", "'" + strings.Join([]string{ + "clang", + "lld", + }, ";") + "'"}, + {"LLVM_ENABLE_RUNTIMES", "'" + strings.Join([]string{ + "compiler-rt", + "libcxx", + "libcxxabi", + "libunwind", + "libclc", + }, ";") + "'"}, } if !t.isStage0() {