mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-30 20:00:10 +00:00
5fa3239224
Changelog: https://github.com/superg/redumper/releases/tag/b720
Diff: https://github.com/superg/redumper/compare/b709...b720
redumper switched to gtest [1], so configure checkPhase to run the
test suite.
[1]: d6ec7f18c6
45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 2f5d66a..e437573 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -221,39 +221,8 @@ endif()
|
|
|
|
target_link_libraries(redumper ${libs})
|
|
|
|
-if(REDUMPER_TARGET_LINUX)
|
|
- target_link_options(redumper PRIVATE "-static")
|
|
-endif()
|
|
-
|
|
install(TARGETS redumper DESTINATION "bin")
|
|
|
|
-# bundle LLVM libc++ for C++20 support (system libc++ is too old, static linking not allowed on macOS)
|
|
-if(REDUMPER_TARGET_MACOS)
|
|
- set_target_properties(redumper PROPERTIES INSTALL_RPATH "@executable_path/../lib")
|
|
-
|
|
- install(FILES
|
|
- "${LLVM_LIB_PATH}/c++/libc++.1.0.dylib"
|
|
- "${LLVM_LIB_PATH}/c++/libc++.1.dylib"
|
|
- "${LLVM_LIB_PATH}/c++/libc++abi.1.0.dylib"
|
|
- "${LLVM_LIB_PATH}/c++/libc++abi.1.dylib"
|
|
- "${LLVM_LIB_PATH}/libunwind.1.0.dylib"
|
|
- "${LLVM_LIB_PATH}/libunwind.1.dylib"
|
|
- DESTINATION "lib"
|
|
- )
|
|
-
|
|
- # fix install names after files are copied & re-sign binaries after modification (install_name_tool invalidates signatures)
|
|
- install(CODE "
|
|
- execute_process(COMMAND install_name_tool -change ${LLVM_LIB_PATH}/c++/libc++.1.dylib @rpath/libc++.1.dylib \${CMAKE_INSTALL_PREFIX}/bin/redumper)
|
|
- execute_process(COMMAND install_name_tool -id @rpath/libc++.1.dylib \${CMAKE_INSTALL_PREFIX}/lib/libc++.1.0.dylib)
|
|
- execute_process(COMMAND install_name_tool -id @rpath/libc++abi.1.dylib \${CMAKE_INSTALL_PREFIX}/lib/libc++abi.1.0.dylib)
|
|
- execute_process(COMMAND install_name_tool -id @rpath/libunwind.1.dylib \${CMAKE_INSTALL_PREFIX}/lib/libunwind.1.0.dylib)
|
|
- execute_process(COMMAND codesign --force --sign - \${CMAKE_INSTALL_PREFIX}/bin/redumper)
|
|
- execute_process(COMMAND codesign --force --sign - \${CMAKE_INSTALL_PREFIX}/lib/libc++.1.0.dylib)
|
|
- execute_process(COMMAND codesign --force --sign - \${CMAKE_INSTALL_PREFIX}/lib/libc++abi.1.0.dylib)
|
|
- execute_process(COMMAND codesign --force --sign - \${CMAKE_INSTALL_PREFIX}/lib/libunwind.1.0.dylib)
|
|
- ")
|
|
-endif()
|
|
-
|
|
# Windows 7 requires administrative access in order to access the disc drive
|
|
if(MSVC AND CMAKE_SYSTEM_VERSION VERSION_EQUAL "6.1")
|
|
set_target_properties(redumper PROPERTIES LINK_FLAGS "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"")
|