[compiler-rt] r321299 - [CMake] Allow passing extra CMake arguments to custom libc++

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 21 12:04:11 PST 2017


Author: phosek
Date: Thu Dec 21 12:04:10 2017
New Revision: 321299

URL: http://llvm.org/viewvc/llvm-project?rev=321299&view=rev
Log:
[CMake] Allow passing extra CMake arguments to custom libc++

This can be used to customize the libc++ build.

Differential Revision: https://reviews.llvm.org/D41103

Modified:
    compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake

Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=321299&r1=321298&r2=321299&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Thu Dec 21 12:04:10 2017
@@ -469,7 +469,7 @@ macro(add_custom_libcxx name prefix)
     message(FATAL_ERROR "libcxx not found!")
   endif()
 
-  cmake_parse_arguments(LIBCXX "" "" "DEPS;CFLAGS" ${ARGN})
+  cmake_parse_arguments(LIBCXX "" "" "DEPS;CFLAGS;CMAKE_ARGS" ${ARGN})
   foreach(flag ${LIBCXX_CFLAGS})
     set(flagstr "${flagstr} ${flag}")
   endforeach()
@@ -491,6 +491,7 @@ macro(add_custom_libcxx name prefix)
                -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                -DLLVM_PATH=${LLVM_MAIN_SRC_DIR}
                -DLIBCXX_STANDALONE_BUILD=On
+               ${LIBCXX_CMAKE_ARGS}
     LOG_BUILD 1
     LOG_CONFIGURE 1
     LOG_INSTALL 1




More information about the llvm-commits mailing list