diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-25 21:50:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 21:50:09 -0500 |
| commit | 7e50da47a283b46cdb8fe199f28bc4b44ad340d7 (patch) | |
| tree | d9cf29ebcfc18de9c651d3a94d6b78115b1525ef | |
| parent | 5e1f24558d4e4fb836439a970887a3738e2e7275 (diff) | |
| parent | 186d945b312dad5ad77cef3d8acdf01b84105825 (diff) | |
Merge pull request #20 from yui-konnu/master
Another macOS fix
| -rw-r--r-- | libc/Makefile | 4 | ||||
| -rw-r--r-- | libgcc/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libc/Makefile b/libc/Makefile index c79f5c3..6ab133b 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -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 \ diff --git a/libgcc/Makefile b/libgcc/Makefile index 8e4667e..c9ddf52 100644 --- a/libgcc/Makefile +++ b/libgcc/Makefile @@ -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 |