diff options
| author | Adam Ierymenko <[email protected]> | 2020-11-19 13:43:57 -0500 |
|---|---|---|
| committer | Adam Ierymenko <[email protected]> | 2020-11-19 13:43:57 -0500 |
| commit | 3ec932e19425fdf6f382227e6883748c142fb99b (patch) | |
| tree | 0f650cc6fe96e5e55be789b900f13182a91b46d0 /make-mac.mk | |
| parent | e3e188109d601bb90b9c98443694367a5368682e (diff) | |
MacOS ARM64 universal binary build fixes.
Diffstat (limited to 'make-mac.mk')
| -rw-r--r-- | make-mac.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/make-mac.mk b/make-mac.mk index d476e9b0..888be7e7 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -3,7 +3,7 @@ CXX=clang++ INCLUDES= DEFS= LIBS= -ARCH_FLAGS=-msse -msse2 -arch x86_64 -arch arm64e +ARCH_FLAGS=-msse -msse2 -arch x86_64 -arch arm64 CODESIGN=echo PRODUCTSIGN=echo @@ -67,6 +67,7 @@ endif # Debug mode -- dump trace output, build binary with -g ifeq ($(ZT_DEBUG),1) ZT_TRACE=1 + ARCH_FLAGS= CFLAGS+=-Wall -g $(INCLUDES) $(DEFS) $(ARCH_FLAGS) STRIP=echo # The following line enables optimization for the crypto code, since @@ -92,10 +93,10 @@ CXXFLAGS=$(CFLAGS) -std=c++11 -stdlib=libc++ all: one macui ext/x64-salsa2012-asm/salsa2012.o: - as -o ext/x64-salsa2012-asm/salsa2012.o ext/x64-salsa2012-asm/salsa2012.s + as -arch x86_64 -o ext/x64-salsa2012-asm/salsa2012.o ext/x64-salsa2012-asm/salsa2012.s mac-agent: FORCE - $(CC) -Ofast -o MacEthernetTapAgent osdep/MacEthernetTapAgent.c + $(CC) -Ofast $(ARCH_FLAGS) -o MacEthernetTapAgent osdep/MacEthernetTapAgent.c $(CODESIGN) -f --options=runtime -s $(CODESIGN_APP_CERT) MacEthernetTapAgent osdep/MacDNSHelper.o: osdep/MacDNSHelper.mm |