Skip to content

Commit 18307e0

Browse files
committed
(macOS) Set up CROSS_COMPILING for ARM 64bit
1 parent 77783aa commit 18307e0

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ ifeq ($(platform),)
2323
else ifneq ($(findstring Darwin,$(shell uname -s)),)
2424
platform = osx
2525
arch = intel
26+
ifeq ($(shell uname -p),arm64)
27+
arch = arm
28+
endif
2629
ifeq ($(shell uname -p),powerpc)
2730
arch = ppc
2831
endif
@@ -112,11 +115,18 @@ ifeq ($(arch),ppc)
112115
OLD_GCC = 1
113116
endif
114117
OSXVER = $(shell sw_vers -productVersion | cut -d. -f 2)
115-
OSX_GT_MOJAVE = $(shell (( $(OSXVER) >= 14)) && echo "YES")
116-
ifneq ($(OSX_GT_MOJAVE),YES)
118+
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
119+
ifeq ($(OSX_LT_MAVERICKS),YES)
117120
#this breaks compiling on Mac OS Mojave
118121
fpic += -mmacosx-version-min=10.1
119122
endif
123+
ifeq ($(CROSS_COMPILE),1)
124+
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
125+
CFLAGS += $(TARGET_RULE)
126+
CPPFLAGS += $(TARGET_RULE)
127+
CXXFLAGS += $(TARGET_RULE)
128+
LDFLAGS += $(TARGET_RULE)
129+
endif
120130
ifndef ($(NOUNIVERSAL))
121131
FLAGS += $(ARCHFLAGS)
122132
LDFLAGS += $(ARCHFLAGS)

0 commit comments

Comments
 (0)