Merge pull request #927

8bed9a4 cmake: wallet: libunbound is not always static (redfish)

src/wallet/CMakeLists.txt

@@ -75,28 +75,10 @@ target_link_libraries(wallet
     ${Boost_REGEX_LIBRARY}
     ${EXTRA_LIBRARIES})
 
-    
-# in case of static build, randon.c.obj from UNBOUND_LIBARY conflicts with the same file from 'crypto'
-# and in case of dynamic build, merge_static_libs called with ${UNBOUND_LIBRARY} will fail
-if (STATIC) 
-    set(libs_to_merge wallet cryptonote_core mnemonics common crypto) 
-    # hack - repack libunbound into another static lib - there's conflicting object file "random.c.obj"
-    merge_static_libs(wallet_merged "${libs_to_merge}")
-    merge_static_libs(wallet_merged2 "${UNBOUND_LIBRARY}")
-    install(TARGETS wallet_merged wallet_merged2
-        ARCHIVE DESTINATION lib)
-else (STATIC)
-    set(libs_to_merge wallet cryptonote_core mnemonics common crypto ${UNBOUND_LIBRARY} ) 
-    merge_static_libs(wallet_merged "${libs_to_merge}")
-    install(TARGETS wallet_merged
-        ARCHIVE DESTINATION lib)
-endif (STATIC)
-
-#MERGE_STATIC_LIBS(wallet_merged wallet_merged "${libs_to_merge}")
-
-
+set(libs_to_merge wallet cryptonote_core mnemonics common crypto)
+merge_static_libs(wallet_merged "${libs_to_merge}")
+install(TARGETS wallet_merged
+    ARCHIVE DESTINATION lib)
 
 install(FILES ${wallet_api_headers}
     DESTINATION include/wallet)
-
-