From c8089db5dfe0dba9d9e576034c3229bd66edc2f3 Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 4 Apr 2018 20:01:27 -0400 Subject: [PATCH] Install the correct libstdc++ --- CMakeLists.txt | 4 ++++ library/CMakeLists.txt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17d6e9cc1..4413ca97b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,6 +304,10 @@ if(APPLE) "b14c857e7e485a097c70a9ccd3132da7") endif() endif() + + install(PROGRAMS ${LIBSTDCXX_DOWNLOAD_DIR}/libstdc++.6.dylib + DESTINATION ./hack/) + endif() #### expose depends #### diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index c47046f82..020a38c4d 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -379,8 +379,6 @@ IF(UNIX) DESTINATION .) install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/dfhack-run DESTINATION .) - install(PROGRAMS ${dfhack_SOURCE_DIR}/package/darwin/osx${DFHACK_BUILD_ARCH}/libstdc++.6.dylib - DESTINATION ./hack/) else() # On linux, copy our version of the df launch script which sets LD_PRELOAD install(PROGRAMS ${dfhack_SOURCE_DIR}/package/linux/dfhack