diff options
author | Petr Hosek <phosek@chromium.org> | 2018-01-20 09:21:00 +0000 |
---|---|---|
committer | Petr Hosek <phosek@chromium.org> | 2018-01-20 09:21:00 +0000 |
commit | 23d02f585056c89d90d2664da842850cd7dd3958 (patch) | |
tree | e437984322fdc59af775cacbedcf3dbbd9f01f66 /cmake/Modules | |
parent | f627ac38dd817f1db3569d15d77f0df036a18a52 (diff) |
Revert "[Fuzzer] Parametrize add_custom_libcxx"
This reverts commit r323032: failing on the sanitizer-x86_64-linux-autoconf bot.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@323033 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules')
-rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index a1267b6c6..21f8fa794 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -469,40 +469,29 @@ macro(add_custom_libcxx name prefix) message(FATAL_ERROR "libcxx not found!") endif() - cmake_parse_arguments(LIBCXX "USE_TOOLCHAIN;NO_INSTALL" "" "DEPS;CFLAGS;CMAKE_ARGS" ${ARGN}) + cmake_parse_arguments(LIBCXX "" "" "DEPS;CFLAGS;CMAKE_ARGS" ${ARGN}) foreach(flag ${LIBCXX_CFLAGS}) set(flagstr "${flagstr} ${flag}") endforeach() set(LIBCXX_CFLAGS ${flagstr}) - if(LIBCXX_USE_TOOLCHAIN) - set(compiler_args -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER} - -DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_CXX_COMPILER}) - if(NOT COMPILER_RT_STANDALONE_BUILD) - set(force_deps DEPENDS clang) - endif() - endif() - - if(CMAKE_SYSROOT) - set(sysroot_arg -DCMAKE_SYSROOT=${CMAKE_SYSROOT}) + if(NOT COMPILER_RT_STANDALONE_BUILD) + list(APPEND LIBCXX_DEPS clang) endif() ExternalProject_Add(${name} - DEPENDS ${LIBCXX_DEPS} PREFIX ${prefix} SOURCE_DIR ${COMPILER_RT_LIBCXX_PATH} - CMAKE_ARGS -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} - ${compiler_args} - ${sysroot_arg} + CMAKE_ARGS -DCMAKE_MAKE_PROGRAM:STRING=${CMAKE_MAKE_PROGRAM} + -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER} + -DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_CXX_COMPILER} -DCMAKE_C_FLAGS=${LIBCXX_CFLAGS} -DCMAKE_CXX_FLAGS=${LIBCXX_CFLAGS} -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DLLVM_PATH=${LLVM_MAIN_SRC_DIR} -DLIBCXX_STANDALONE_BUILD=On ${LIBCXX_CMAKE_ARGS} - INSTALL_COMMAND "" - STEP_TARGETS configure build LOG_BUILD 1 LOG_CONFIGURE 1 LOG_INSTALL 1 @@ -519,19 +508,8 @@ macro(add_custom_libcxx name prefix) COMMAND ${CMAKE_COMMAND} -E make_directory <BINARY_DIR> COMMENT "Clobberring ${name} build directory..." DEPENDERS configure - ${force_deps} + DEPENDS ${LIBCXX_DEPS} ) - - if(NOT LIBCXX_NO_INSTALL) - install(CODE "execute_process\(COMMAND \${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX} -P ${BINARY_DIR}/cmake_install.cmake \)" - COMPONENT ${name}) - add_custom_target(install-${name} - DEPENDS ${name} - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" - USES_TERMINAL) - endif() endmacro() function(rt_externalize_debuginfo name) |