Commit 05e33940 authored by Daniel Agar's avatar Daniel Agar

fixes #402 cmake fix libunwind release flags

-don't pass empty CFLAGS='' when buliding libunwind in release mode
-revert libunwind to older version that has per thread caching enabled
and match Makefile
parent 3c0d99cf
...@@ -95,7 +95,7 @@ llvm_map_components_to_libnames(LLVM_LIBS core mcjit native bitreader ipo irread ...@@ -95,7 +95,7 @@ llvm_map_components_to_libnames(LLVM_LIBS core mcjit native bitreader ipo irread
# libunwind # libunwind
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(LIBUNWIND_FLAGS "-g -O0") set(LIBUNWIND_DEBUG_CFLAGS "CFLAGS=-O0 -g")
set(LIBUNWIND_DEBUG "--enable-debug") set(LIBUNWIND_DEBUG "--enable-debug")
set(LIBUNWIND_DEBUG_FRAME "--enable-debug-frame") set(LIBUNWIND_DEBUG_FRAME "--enable-debug-frame")
endif() endif()
...@@ -104,7 +104,7 @@ ExternalProject_Add(libunwind ...@@ -104,7 +104,7 @@ ExternalProject_Add(libunwind
SOURCE_DIR ${CMAKE_SOURCE_DIR}/libunwind SOURCE_DIR ${CMAKE_SOURCE_DIR}/libunwind
DEPENDS gitsubmodules DEPENDS gitsubmodules
UPDATE_COMMAND autoreconf -i UPDATE_COMMAND autoreconf -i
CONFIGURE_COMMAND ${CMAKE_SOURCE_DIR}/libunwind/configure CFLAGS=${LIBUNWIND_FLAGS} CXXFLAGS=${LIBUNWIND_FLAGS} --prefix=${CMAKE_BINARY_DIR}/libunwind --enable-shared=0 ${LIBUNWIND_DEBUG} ${LIBUNWIND_DEBUG_FRAME} CONFIGURE_COMMAND ${CMAKE_SOURCE_DIR}/libunwind/configure ${LIBUNWIND_DEBUG_CFLAGS} --prefix=${CMAKE_BINARY_DIR}/libunwind --enable-shared=0 ${LIBUNWIND_DEBUG} ${LIBUNWIND_DEBUG_FRAME}
LOG_UPDATE ON LOG_UPDATE ON
LOG_CONFIGURE ON LOG_CONFIGURE ON
LOG_BUILD ON LOG_BUILD ON
......
libunwind @ 65ac8674
Subproject commit 6e3254ea6e6fa6c433cd38f9716a0b3b4110de64 Subproject commit 65ac86741606e1d87aef75755c699e4fa6884230
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment