Merge pull request #4448

6a78140 Make depends use self built clang for darwin (TheCharlatan)

CMakeLists.txt

@@ -883,10 +883,14 @@ list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
 
 if (HIDAPI_FOUND) 
   if (APPLE)
-    find_library(COREFOUNDATION CoreFoundation)
-    find_library(IOKIT IOKit)
-    list(APPEND EXTRA_LIBRARIES ${IOKIT})
-    list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
+    if(DEPENDS)
+      list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
+    else()
+      find_library(COREFOUNDATION CoreFoundation)
+      find_library(IOKIT IOKit)
+      list(APPEND EXTRA_LIBRARIES ${IOKIT})
+      list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
+    endif()
   endif()
   if (WIN32)
     list(APPEND EXTRA_LIBRARIES setupapi)

contrib/depends/packages/hidapi-darwin.mk

@@ -11,7 +11,7 @@ endef
 
 define $(package)_config_cmds
   ./bootstrap &&\
-  $($(package)_autoconf) $($(package)_config_opts) RANLIB="$(host_prefix)/native/bin/x86_64-apple-darwin11-ranlib" AR="$(host_prefix)/native/bin/x86_64-apple-darwin11-ar"
+  $($(package)_autoconf) $($(package)_config_opts) RANLIB="$(host_prefix)/native/bin/x86_64-apple-darwin11-ranlib" AR="$(host_prefix)/native/bin/x86_64-apple-darwin11-ar" CC="$(host_prefix)/native/bin/$($(package)_cc)"
 endef
 
 define $(package)_build_cmds

contrib/depends/packages/packages.mk

@@ -4,7 +4,7 @@ native_packages := native_ccache
 wallet_packages=bdb
 
 darwin_native_packages = native_biplist native_ds_store native_mac_alias
-darwin_packages += sodium-darwin hidapi-darwin
+darwin_packages = sodium-darwin hidapi-darwin
 
 linux_packages = eudev libusb hidapi-linux
 

contrib/depends/packages/sodium-darwin.mk

@@ -5,13 +5,14 @@ $(package)_file_name=libsodium-$($(package)_version).tar.gz
 $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
 
 define $(package)_set_vars
+$(package)_build_opts_darwin=OS=Darwin LIBTOOL="$($(package)_libtool)"
 $(package)_config_opts=--enable-static
 $(package)_config_opts+=--prefix=$(host_prefix)
 endef
 
 define $(package)_config_cmds
   ./autogen.sh &&\
-  $($(package)_autoconf) $($(package)_config_opts) RANLIB="$(host_prefix)/native/bin/x86_64-apple-darwin11-ranlib" AR="$(host_prefix)/native/bin/x86_64-apple-darwin11-ar"
+  $($(package)_autoconf) $($(package)_config_opts) RANLIB="$(host_prefix)/native/bin/x86_64-apple-darwin11-ranlib" AR="$(host_prefix)/native/bin/x86_64-apple-darwin11-ar" CC="$(host_prefix)/native/bin/$($(package)_cc)"
 endef
 
 define $(package)_build_cmds