diff options
author | Dsaster <78389441+dsastr@users.noreply.github.com> | 2021-02-20 14:59:59 +0100 |
---|---|---|
committer | Dsaster <78389441+dsastr@users.noreply.github.com> | 2021-02-20 14:59:59 +0100 |
commit | 25b2fe15f401804e99dddf4fd3b15ac49afd9246 (patch) | |
tree | 54b6c07210c5479df3ad17f3cb88d298fe35ad1d /tools/mwasmarm_patcher | |
parent | 7b7d9ac83ebe77efb176b7a20a98b2baf3dfa852 (diff) | |
parent | 41bce72d7d97a7843debfe0807d68423f54142f5 (diff) |
fix conflicts
Diffstat (limited to 'tools/mwasmarm_patcher')
-rw-r--r-- | tools/mwasmarm_patcher/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/mwasmarm_patcher/Makefile b/tools/mwasmarm_patcher/Makefile index 9765f713..26df548c 100644 --- a/tools/mwasmarm_patcher/Makefile +++ b/tools/mwasmarm_patcher/Makefile @@ -1,6 +1,11 @@ .PHONY: all clean
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+CC := gcc-5
+else
CC := gcc
+endif
CFLAGS := -O3
.PHONY: all clean
|