From 77ee74be50d673fef1b4b3aecc907e0b15fb27cd Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 9 May 2018 21:15:22 -0400 Subject: [PATCH] Only require symbols to be defined in plugins Core uses some unresolved symbols on Linux --- CMakeLists.txt | 2 -- plugins/Plugins.cmake | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c45f22f1e..3849ef462 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,8 +217,6 @@ if(APPLE) set(CMAKE_MACOSX_RPATH 1) elseif(UNIX) add_definitions(-D_LINUX) - # Check for unresolved symbols at link time - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,defs") elseif(WIN32) add_definitions(-DWIN32) endif() diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake index b97db055d..bf1ebd88b 100644 --- a/plugins/Plugins.cmake +++ b/plugins/Plugins.cmake @@ -6,6 +6,11 @@ IF(UNIX) IF(DFHACK_BUILD_64) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -mno-avx") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mno-avx") + IF(NOT APPLE) + # Linux: Check for unresolved symbols at link time + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,defs") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,defs") + ENDIF() ELSE() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")