Install the correct libstdc++

2018-04-04 20:01:27 -04:00 · 2018-04-04 20:01:27 -04:00 · c8089db5df
parent ceb4cc7577
commit c8089db5df
2 changed files with 4 additions and 2 deletions
--- 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 ####
--- 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