Merge pull request #20 from yui-konnu/master

Another macOS fix
This commit is contained in:
Marcus Huderle 2018-05-25 21:50:09 -05:00 committed by GitHub
commit 7e50da47a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ CPPFLAGS := -I ../ginclude -I include -nostdinc -undef \
-DABORT_PROVIDED -DHAVE_GETTIMEOFDAY -D__thumb__ -DARM_RDI_MONITOR \
-D__STDC__ -D__GNUC__ -DINTERNAL_NEWLIB -D__USER_LABEL_PREFIX__=
AR := ar
AR := $(DEVKITARM)/bin/arm-none-eabi-ar
# Clear the default suffixes.
.SUFFIXES:
@ -21,7 +21,7 @@ AR := ar
.PHONY: all clean
C_SRCS := $(shell find -iname "*.c" -a ! -iname "mallocr.c")
C_SRCS := $(shell find . -iname "*.c" -a ! -iname "mallocr.c")
C_INTRS := $(C_SRCS:%.c=%.i)
C_OBJS := $(C_SRCS:%.c=%.o) \
stdlib/mallocr.o stdlib/freer.o stdlib/reallocr.o stdlib/callocr.o \

View File

@ -1,7 +1,7 @@
CC1 = ../old_agbcc
CPP = cpp
CPP = $(DEVKITARM)/bin/arm-none-eabi-cpp
AS = $(DEVKITARM)/bin/arm-none-eabi-as
AR = ar
AR = $(DEVKITARM)/bin/arm-none-eabi-ar
libgcc.a: libgcc1.a libgcc2.a fp-bit.o dp-bit.o
$(AR) -x libgcc1.a