about summary refs log tree commit diff homepage
path: root/scripts/build/p-llvm.inc
diff options
context:
space:
mode:
authorJulian Büning <julian.buening@rwth-aachen.de>2019-08-04 21:26:56 +0200
committerMartinNowack <martin.nowack@gmail.com>2019-09-09 10:39:36 +0100
commit0fd707b62988ed25c31242eb3d858895d96eb619 (patch)
treed8abebc6a1a9df995225e3df4b0399d089d33303 /scripts/build/p-llvm.inc
parent649c8bce588f04ed9099686f0d9ed9c326567c44 (diff)
downloadklee-0fd707b62988ed25c31242eb3d858895d96eb619.tar.gz
fix minor build script issues and inconsistencies
mostly following shellcheck
Diffstat (limited to 'scripts/build/p-llvm.inc')
-rw-r--r--scripts/build/p-llvm.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/build/p-llvm.inc b/scripts/build/p-llvm.inc
index 43be3399..d0c362c2 100644
--- a/scripts/build/p-llvm.inc
+++ b/scripts/build/p-llvm.inc
@@ -132,8 +132,8 @@ build_llvm() {
        cd "${SANITIZER_LLVM_LIBCXX}"
        cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DLLVM_USE_SANITIZER=MemoryWithOrigins \
-        "${SANITIZER_CMAKE_C_COMPILER}" \
-        "${SANITIZER_CMAKE_CXX_COMPILER}" \
+        "${SANITIZER_CMAKE_C_COMPILER[@]}" \
+        "${SANITIZER_CMAKE_CXX_COMPILER[@]}" \
         "${LLVM_SRC_BASE}"
        ninja cxx cxxabi
 
@@ -144,8 +144,8 @@ build_llvm() {
        CXX_F="${SANITIZER_CXX_FLAGS[*]}"
        LD_F="${SANITIZER_LD_FLAGS[*]}"
        cmake -GNinja \
-          "${SANITIZER_CMAKE_C_COMPILER[*]}" \
-          "${SANITIZER_CMAKE_CXX_COMPILER[*]}" \
+          "${SANITIZER_CMAKE_C_COMPILER[@]}" \
+          "${SANITIZER_CMAKE_CXX_COMPILER[@]}" \
           -DCMAKE_C_FLAGS="$C_F" \
           -DCMAKE_CXX_FLAGS="${CXX_F}" \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -171,7 +171,7 @@ build_llvm() {
   # Configure LLVM
   CONFIG=(
      "-DCMAKE_INSTALL_PREFIX=${LLVM_INSTALL}"
-     "-LLVM_BUILD_LLVM_DYLIB=TRUE"
+     "-DLLVM_BUILD_LLVM_DYLIB=TRUE"
   )
   # cmake build
   if [[ "${enable_optimized}" == "1" && "${enable_debug}" != "1" ]]; then
@@ -204,11 +204,11 @@ build_llvm() {
 
   # Remove unneeded targets
   CONFIG+=(
-     -DLLVM_INCLUDE_EXAMPLES=OFF
-#     -DLLVM_INCLUDE_TESTS=OFF
-#     -DCLANG_INCLUDE_TESTS=OFF
-     -DLLVM_INCLUDE_BENCHMARKS=OFF
-     -DBUILD_SHARED_LIBS=ON
+     "-DLLVM_INCLUDE_EXAMPLES=OFF"
+#     "-DLLVM_INCLUDE_TESTS=OFF"
+#     "-DCLANG_INCLUDE_TESTS=OFF"
+     "-DLLVM_INCLUDE_BENCHMARKS=OFF"
+     "-DBUILD_SHARED_LIBS=ON"
   )
 
   local variables=("")