Skip to content
Snippets Groups Projects
Commit 357fd0cb authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Add support for fat Darwin builds...

Using FAT=1 one the make command-line
parent 12857f64
No related branches found
No related tags found
No related merge requests found
Pipeline #6638 passed
...@@ -196,10 +196,18 @@ ifeq ($(os),win64) ...@@ -196,10 +196,18 @@ ifeq ($(os),win64)
else else
ifdef MINGW32 ifdef MINGW32
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make target-mingw $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make target-mingw
else
ifeq ($(os),darwin)
ifdef FAT
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make BUILDOPTS="-arch x86_64 -arch arm64"
else
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make
endif
else else
$(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make
endif endif
endif endif
endif
endif endif
$(QUIET)cp $(CRYPT_SRC)/libcl.a $(CRYPT_IDIR) $(QUIET)cp $(CRYPT_SRC)/libcl.a $(CRYPT_IDIR)
$(QUIET)cp $(CRYPT_SRC)/cryptlib.h $(CRYPT_IDIR) $(QUIET)cp $(CRYPT_SRC)/cryptlib.h $(CRYPT_IDIR)
...@@ -253,6 +253,10 @@ ifndef win ...@@ -253,6 +253,10 @@ ifndef win
endif endif
ifeq ($(os),darwin) ifeq ($(os),darwin)
ifdef FAT
CFLAGS += -arch x86_64 -arch arm64
LDFLAGS += -arch x86_64 -arch arm64
endif
ifeq ("$(machine_uname)","") ifeq ("$(machine_uname)","")
ifeq ($(shell sysctl hw.optional.x86_64),hw.optional.x86_64: 1) ifeq ($(shell sysctl hw.optional.x86_64),hw.optional.x86_64: 1)
machine_uname := x86_64 machine_uname := x86_64
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment