s/VERBOSE_CONFIG/FIND_LLVM_VERBOSE_CONFIG

goldsborough · Mar 23, 2017 · aea12f3 · aea12f3
1 parent ff54c63
commit aea12f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmake/modules/FindLLVM.cmake b/cmake/modules/FindLLVM.cmake
@@ -23,7 +23,7 @@
 #     The include directory for libc++, if it exists.
 ################################################################################
 
-option(VERBOSE_CONFIG off)
+option(FIND_LLVM_VERBOSE_CONFIG off)
 
 function(set_llvm_variable variable flags)
   execute_process(
@@ -37,7 +37,7 @@ function(set_llvm_variable variable flags)
   else()
       string(REPLACE "\n" ";" output ${output})
       separate_arguments(output)
-      if (VERBOSE_CONFIG)
+      if (FIND_LLVM_VERBOSE_CONFIG)
         message(STATUS "Found LLVM_${variable}: ${output}")
       endif()
       set(LLVM_${variable} "${output}" PARENT_SCOPE)

diff --git a/docker/build.sh b/docker/build.sh
@@ -7,7 +7,7 @@ if [[ ! -d /llvm/build ]]; then
 fi
 
 # Find out what clang is called on here.
-which clang++-3.9 2>/dev/null
+which clang++-3.9
 if [[ $? -eq 0 ]]; then
   export CXX=clang++-3.9
 else
@@ -38,7 +38,7 @@ cmake -DLLVM_PATH=/llvm \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_C_COMPILER=$C \
       -DCMAKE_CXX_COMPILER=$CXX \
-      -DVERBOSE_CONFIG=on \
+      -DFIND_LLVM_VERBOSE_CONFIG=on \
       -DCLANG_EXPAND_OS_NAME=$1 \
       /home/project
 make -j4