Skip to content

Commit 46cf787

Browse files
hebastohebasto
committed
build: Define -arch for host compilers on darwin builders
This change fixes cross-compiling on M1 Apple Silicon systems.
1 parent 7fc298c commit 46cf787

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

‎depends/builders/darwin.mk‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ build_darwin_SHA256SUM=shasum -a 256
1010
build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
1111

1212
#darwin host on darwin builder. overrides darwin host preferences.
13-
darwin_CC := $(build_darwin_CC) -mmacosx-version-min=$(OSX_MIN_VERSION)
14-
darwin_CXX := $(build_darwin_CXX) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++
13+
x86_64_darwin_CC := $(build_darwin_CC) -arch x86_64 -mmacosx-version-min=$(OSX_MIN_VERSION)
14+
x86_64_darwin_CXX := $(build_darwin_CXX) -arch x86_64 -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++
15+
aarch64_darwin_CC := $(build_darwin_CC) -arch arm64 -mmacosx-version-min=$(OSX_MIN_VERSION)
16+
aarch64_darwin_CXX := $(build_darwin_CXX) -arch arm64 -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++
1517
darwin_AR:=$(shell xcrun -f ar)
1618
darwin_RANLIB:=$(shell xcrun -f ranlib)
1719
darwin_STRIP:=$(shell xcrun -f strip)

0 commit comments

Comments
 (0)