mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-26 01:12:39 +00:00
Merge pull request #4448
6a781408
Make depends use self built clang for darwin (TheCharlatan)
This commit is contained in:
parent
5bcead236f
commit
8e98ed8c71
4 changed files with 12 additions and 7 deletions
|
@ -883,10 +883,14 @@ list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
|
||||||
|
|
||||||
if (HIDAPI_FOUND)
|
if (HIDAPI_FOUND)
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
find_library(COREFOUNDATION CoreFoundation)
|
if(DEPENDS)
|
||||||
find_library(IOKIT IOKit)
|
list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
|
||||||
list(APPEND EXTRA_LIBRARIES ${IOKIT})
|
else()
|
||||||
list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
|
find_library(COREFOUNDATION CoreFoundation)
|
||||||
|
find_library(IOKIT IOKit)
|
||||||
|
list(APPEND EXTRA_LIBRARIES ${IOKIT})
|
||||||
|
list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
list(APPEND EXTRA_LIBRARIES setupapi)
|
list(APPEND EXTRA_LIBRARIES setupapi)
|
||||||
|
|
|
@ -11,7 +11,7 @@ endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
./bootstrap &&\
|
./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
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
|
|
|
@ -4,7 +4,7 @@ native_packages := native_ccache
|
||||||
wallet_packages=bdb
|
wallet_packages=bdb
|
||||||
|
|
||||||
darwin_native_packages = native_biplist native_ds_store native_mac_alias
|
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
|
linux_packages = eudev libusb hidapi-linux
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,14 @@ $(package)_file_name=libsodium-$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
|
$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
|
||||||
|
|
||||||
define $(package)_set_vars
|
define $(package)_set_vars
|
||||||
|
$(package)_build_opts_darwin=OS=Darwin LIBTOOL="$($(package)_libtool)"
|
||||||
$(package)_config_opts=--enable-static
|
$(package)_config_opts=--enable-static
|
||||||
$(package)_config_opts+=--prefix=$(host_prefix)
|
$(package)_config_opts+=--prefix=$(host_prefix)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
./autogen.sh &&\
|
./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
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
|
|
Loading…
Reference in a new issue