[PATCH] D12500: [CMake] Fix building builtins on Linux and Darwin.

[Alexey Samsonov via llvm-commits]

samsonov added inline comments.

================
Comment at: cmake/config-ix.cmake:261
@@ -260,2 +260,3 @@
 
+set(ALL_BUILTIN_SUPPORTED_ARCH i386 ${X86_64} ${ARM32} ${ARM64})
 set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} i386 i686 powerpc64
----------------
You also need i686 here (it's currently listed in lib/builtins/CMakeLists.txt).

================
Comment at: cmake/config-ix.cmake:419
@@ -415,2 +418,3 @@
   # Architectures supported by compiler-rt libraries.
   filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
+    ${ALL_BUILTIN_SUPPORTED_ARCH})
----------------
Please fix the variable name to `BUILTIN_SUPPORTED_ARCH`

================
Comment at: lib/builtins/CMakeLists.txt:335
@@ +334,3 @@
+      list(APPEND ${os}_builtin_libs clang_rt.builtins_${arch}_${os})
+      set(${os}_builtin_lipo_flags ${${os}_builtin_lipo_flags} -arch ${arch} ${COMPILER_RT_LIBRARY_OUTPUT_DIR}/libclang_rt.builtins_${arch}_${os}.a)
+    endforeach()
----------------
You probably can also list(APPEND) here. Also, please keep the line length smaller.

================
Comment at: lib/builtins/CMakeLists.txt:340
@@ +339,3 @@
+      add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/clang_rt.builtins_${os}.a
+        COMMAND lipo -output ${COMPILER_RT_LIBRARY_OUTPUT_DIR}/clang_rt.builtins_${os}.a -create ${${os}_builtin_lipo_flags}
+        DEPENDS ${${os}_builtin_libs}
----------------
Line length.


http://reviews.llvm.org/D12500