mirror of https://github.com/sm64pc/sm64pc.git
Fix compilation on Apple silicon (#512)
* Fix build on M1 Macs * Fix race conditions on parallel builds
This commit is contained in:
parent
03f0199c8f
commit
afc7e8da69
37
Makefile
37
Makefile
|
@ -112,26 +112,25 @@ endif
|
||||||
# macOS overrides
|
# macOS overrides
|
||||||
ifeq ($(HOST_OS),Darwin)
|
ifeq ($(HOST_OS),Darwin)
|
||||||
OSX_BUILD := 1
|
OSX_BUILD := 1
|
||||||
|
# Using Homebrew?
|
||||||
|
ifeq ($(shell which brew >/dev/null 2>&1 && echo y),y)
|
||||||
|
PLATFORM := $(shell uname -m)
|
||||||
|
OSX_GCC_VER = $(shell find `brew --prefix`/bin/gcc* | grep -oE '[[:digit:]]+' | sort -n | uniq | tail -1)
|
||||||
|
CC := gcc-$(OSX_GCC_VER)
|
||||||
|
CXX := g++-$(OSX_GCC_VER)
|
||||||
|
CPP := cpp-$(OSX_GCC_VER) -P
|
||||||
|
PLATFORM_CFLAGS := -I $(shell brew --prefix)/include
|
||||||
|
PLATFORM_LDFLAGS := -L $(shell brew --prefix)/lib
|
||||||
# Using MacPorts?
|
# Using MacPorts?
|
||||||
ifeq ($(shell test -d /opt/local/lib && echo y),y)
|
else ifeq ($(shell test -d /opt/local/lib && echo y),y)
|
||||||
OSX_GCC_VER = $(shell find /opt/local/bin/gcc* | grep -oE '[[:digit:]]+' | sort -n | uniq | tail -1)
|
OSX_GCC_VER = $(shell find /opt/local/bin/gcc* | grep -oE '[[:digit:]]+' | sort -n | uniq | tail -1)
|
||||||
CC := gcc-mp-$(OSX_GCC_VER)
|
CC := gcc-mp-$(OSX_GCC_VER)
|
||||||
CXX := g++-mp-$(OSX_GCC_VER)
|
CXX := g++-mp-$(OSX_GCC_VER)
|
||||||
CPP := cpp-mp-$(OSX_GCC_VER) -P
|
CPP := cpp-mp-$(OSX_GCC_VER) -P
|
||||||
PLATFORM_CFLAGS := -I /opt/local/include
|
PLATFORM_CFLAGS := -I /opt/local/include
|
||||||
PLATFORM_LDFLAGS := -L /opt/local/lib
|
PLATFORM_LDFLAGS := -L /opt/local/lib
|
||||||
else
|
else
|
||||||
# Using Homebrew?
|
$(error No suitable macOS toolchain found, have you installed Homebrew?)
|
||||||
ifeq ($(shell which brew >/dev/null 2>&1 && echo y),y)
|
|
||||||
OSX_GCC_VER = $(shell find `brew --prefix`/bin/gcc* | grep -oE '[[:digit:]]+' | sort -n | uniq | tail -1)
|
|
||||||
CC := gcc-$(OSX_GCC_VER)
|
|
||||||
CXX := g++-$(OSX_GCC_VER)
|
|
||||||
CPP := cpp-$(OSX_GCC_VER) -P
|
|
||||||
PLATFORM_CFLAGS := -I /usr/local/include
|
|
||||||
PLATFORM_LDFLAGS := -L /usr/local/lib
|
|
||||||
else
|
|
||||||
$(error No suitable macOS toolchain found, have you installed Homebrew?)
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -266,7 +265,7 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Make tools if out of date
|
# Make tools if out of date
|
||||||
DUMMY != CC=$(CC) CXX=$(CXX) $(MAKE) -C tools >&2 || echo FAIL
|
DUMMY != CC=$(CC) CXX=$(CXX) $(MAKE) -C tools -j1 >&2 || echo FAIL
|
||||||
ifeq ($(DUMMY),FAIL)
|
ifeq ($(DUMMY),FAIL)
|
||||||
$(error Failed to build tools)
|
$(error Failed to build tools)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue