Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -180,16 +180,16 @@ 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}") Index: cmake/Modules/HandleCompilerRT.cmake =================================================================== --- cmake/Modules/HandleCompilerRT.cmake +++ cmake/Modules/HandleCompilerRT.cmake @@ -3,7 +3,7 @@ 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}")