From 9ad496b2c8b9c2c41dc03cbc3e7529fc02a310ef Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Sun, 16 Apr 2017 06:08:44 +0000 Subject: [PATCH] [CMake][libunwind] Fix the -target and -gcc-toolchain flag handling CMake has the problem with the single dash variant because of the space, so use the double dash with equal sign version. The compile flag handling had a typo which caused these flag not to be properly include. We also don't have to pass the target triple when checking for compiler-rt since that flag is already included in compile flags now. Differential Revision: https://reviews.llvm.org/D32071 llvm-svn: 300419 --- libunwind/CMakeLists.txt | 6 +++--- libunwind/cmake/Modules/HandleCompilerRT.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 0b90cda918d7..032df560f2c6 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -180,16 +180,16 @@ macro(add_target_flags_if condition var) if (${condition}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${var}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${var}") - list(APPEND LINUNWIND_COMPILE_FLAGS ${var}) + list(APPEND LIBUNWIND_COMPILE_FLAGS ${var}) list(APPEND LIBUNWIND_LINK_FLAGS ${var}) endif() endmacro() add_target_flags_if(LIBUNWIND_BUILD_32_BITS "-m32") add_target_flags_if(LIBUNWIND_TARGET_TRIPLE - "-target ${LIBUNWIND_TARGET_TRIPLE}") + "--target=${LIBUNWIND_TARGET_TRIPLE}") add_target_flags_if(LIBUNWIND_GCC_TOOLCHAIN - "-gcc-toolchain ${LIBUNWIND_GCC_TOOLCHAIN}") + "--gcc-toolchain=${LIBUNWIND_GCC_TOOLCHAIN}") add_target_flags_if(LIBUNWIND_SYSROOT "--sysroot=${LIBUNWIND_SYSROOT}") diff --git a/libunwind/cmake/Modules/HandleCompilerRT.cmake b/libunwind/cmake/Modules/HandleCompilerRT.cmake index 5696ec3b388e..9bf88bb4c279 100644 --- a/libunwind/cmake/Modules/HandleCompilerRT.cmake +++ b/libunwind/cmake/Modules/HandleCompilerRT.cmake @@ -3,7 +3,7 @@ function(find_compiler_rt_library name dest) message(FATAL_ERROR "LIBUNWIND_COMPILE_FLAGS must be defined when using this function") endif() set(dest "" PARENT_SCOPE) - set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${TARGET_TRIPLE} ${LIBUNWIND_COMPILE_FLAGS} + set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBUNWIND_COMPILE_FLAGS} "--rtlib=compiler-rt" "--print-libgcc-file-name") if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}")