jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

contrib: set CMAKE_SYSTEM_PROCESSOR on Darwin

Browse Source 
Change-Id: I51ccb462103a30d557830d31c5075f73d393ed97
This commit is contained in:
Adrien Béraud
2025-08-01 14:53:57 -04:00
parent 88ffdfb299
commit 8111dd56ba
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/bootstrap
View File

@ -238,13 +238,14 @@ test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
OS="${HOST#*-}" # strip architecture OS="${HOST#*-}" # strip architecture
case "${OS}" in case "${OS}" in
apple-darwin*) apple-darwin*)
add_make_enabled "HAVE_DARWIN_OS" "HAVE_BSD"
if test -z "$BUILDFORIOS" if test -z "$BUILDFORIOS"
then then
check_macosx_sdk check_macosx_sdk
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD" add_make_enabled "HAVE_MACOSX"
else else
check_ios_sdk check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A" add_make_enabled "HAVE_IOS" "HAVE_NEON"
fi fi
;; ;;
*bsd*) *bsd*)

2
contrib/src/get-arch.sh
View File

@ -20,7 +20,7 @@ case "$HOST" in
ARCH="ppc64" ARCH="ppc64"
;; ;;
aarch64-*) aarch64-*)
if $HAVE_IOS if $HAVE_DARWIN_OS
then then
ARCH="arm64" ARCH="arm64"
else else

1
contrib/src/main.mak
View File

@ -562,6 +562,7 @@ ifdef HAVE_WIN32
endif endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
echo "set(CMAKE_SYSTEM_NAME Darwin)" >> $@ echo "set(CMAKE_SYSTEM_NAME Darwin)" >> $@
echo "set(CMAKE_SYSTEM_PROCESSOR $(ARCH))" >> $@
echo "set(CMAKE_C_FLAGS \"$(CFLAGS)\")" >> $@ echo "set(CMAKE_C_FLAGS \"$(CFLAGS)\")" >> $@
echo "set(CMAKE_CXX_FLAGS \"$(CXXFLAGS)\")" >> $@ echo "set(CMAKE_CXX_FLAGS \"$(CXXFLAGS)\")" >> $@
echo "set(CMAKE_LD_FLAGS \"$(LDFLAGS)\")" >> $@ echo "set(CMAKE_LD_FLAGS \"$(LDFLAGS)\")" >> $@