fix amd64 builds on macos

fix homebrew_prefix
This commit is contained in:
Czarek Nakamoto
2024-05-15 17:28:12 +02:00
parent 060c27f91e
commit 9a81739945
2 changed files with 13 additions and 3 deletions

View File

@@ -148,10 +148,13 @@ pushd $repo/contrib/depends
MACOS_LIBS_DIR="${PWD}/host-apple-darwin"
rm -rf ${MACOS_LIBS_DIR}
mkdir -p ${MACOS_LIBS_DIR}/lib
export HOMEBREW_PREFIX=/opt/homebrew
if [[ ! -d "$HOMEBREW_PREFIX" ]];
if [[ "x$HOMEBREW_PREFIX" == "x" ]];
then
export HOMEBREW_PREFIX=/usr/local
export HOMEBREW_PREFIX=/opt/homebrew
if [[ ! -d "$HOMEBREW_PREFIX" ]];
then
export HOMEBREW_PREFIX=/usr/local
fi
fi
verbose_copy "${HOMEBREW_PREFIX}/lib/libunbound.a" ${MACOS_LIBS_DIR}/lib/libunbound.a
verbose_copy "${HOMEBREW_PREFIX}/lib/libboost_chrono-mt.a" ${MACOS_LIBS_DIR}/lib/libboost_chrono-mt.a

View File

@@ -294,6 +294,13 @@ else()
set(EXTRA_LIBS "")
endif()
if (${HOST_ABI} STREQUAL "host-apple-darwin")
EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
if (NOT ${ARCHITECTURE} STREQUAL arm64)
set(EXTRA_LIBS "wallet-crypto")
endif()
endif()
if (${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR ${HOST_ABI} STREQUAL "aarch64-apple-darwin11")
set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" "-framework Cocoa" hidapi)
# set_target_properties(wallet2_api_c PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks")