Allows to build libc++ with -DLLVM_USE_SANITIZER="Address;Undefined" on OSX

[mehdi_amini]

Summary

It seems some cases were missing to the configuration.

[beanz]

lib/CMakeLists.txt

51

Rather than doing this as a STREQUAL where you have to check both possible orders, maybe we should iterate over the list?

Something more like:

foreach(sanitizer in ${LLVM_USE_SANITIZER})
  if(sanitizer STREQUAL "Address")
    set(enable_address On)
  endif()
  if(sanitizer STREQUAL "Undefined")
    set(enable_ub On)
  endif()
  ... <other sanitizers>
endforeach()

if(enable_address and enable_undefined)
...
elseif(...)
endif()

I think doing it this way makes the code more adaptable to future changes.

Alternatively you can get rid of needing to check both orders by using the list(FIND ...) CMake command, which might be cleaner too.

[mehdi_amini]

Thanks, that's a lot cleaner indeed. I'll update.

lib/CMakeLists.txt

 
 add_library_flags_if(LIBCXX_COVERAGE_LIBRARY "${LIBCXX_COVERAGE_LIBRARY}")
 
 add_library_flags_if(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "-Wl,--whole-archive" "-Wl,-Bstatic")
 add_library_flags("${LIBCXX_CXX_ABI_LIBRARY}")
 add_library_flags_if(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "-Wl,-Bdynamic" "-Wl,--no-whole-archive")
 
 if (APPLE AND LLVM_USE_SANITIZER)
-  if ("${LLVM_USE_SANITIZER}" STREQUAL "Address")
+  if ("${LLVM_USE_SANITIZER}" STREQUAL "Address" OR
+      "${LLVM_USE_SANITIZER}" STREQUAL "Address;Undefined" OR
+      "${LLVM_USE_SANITIZER}" STREQUAL "Undefined;Address")
     set(LIBFILE "libclang_rt.asan_osx_dynamic.dylib")
   elseif("${LLVM_USE_SANITIZER}" STREQUAL "Undefined")
     set(LIBFILE "libclang_rt.ubsan_osx_dynamic.dylib")
   else()
     message(WARNING "LLVM_USE_SANITIZER=${LLVM_USE_SANITIZER} is not supported on OS X")
   endif()
   if (LIBFILE)
     execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=lib OUTPUT_VARIABLE LIBDIR RESULT_VARIABLE Result)