Add missing CLANG_ANALYZE check back.

[vogl] / src / build_options.cmake

diff --git a/src/build_options.cmake b/src/build_options.cmake
index b29e79ef0ec6fb43fb2ebc4a69a9e5b44781bbb1..602e19fd494c575425890b553d6a80e065b5e65e 100644 (file)
--- a/src/build_options.cmake
+++ b/src/build_options.cmake
@@ -30,7 +30,7 @@ option(USE_TELEMETRY "Build with Telemetry" OFF)
 
 if( NOT BUILD_X64 )
   # If we're in our 64-bit chroot, default to 64-bit, else 32-bit
-  if( "$ENV{SCHROOT_CHROOT_NAME}" STREQUAL "vogl_precise_amd64" )
+  if( "$ENV{SCHROOT_CHROOT_NAME}" MATCHES "(.*)amd64(.*)" )
     set(BUILD_X64 "TRUE")
   else()
     set(BUILD_X64 "FALSE")
@@ -94,7 +94,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
           "-Wno-padded"
           "-Wno-variadic-macros"
           )
-  elseif ()
+  elseif (CLANG_ANALYZE)
       set(CMAKE_CXX_FLAGS_LIST ${CMAKE_CXX_FLAGS_LIST}
           "--analyze"
           "-ferror-limit=0"         # Don't ever stop emitting diagnostics