diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-26 19:18:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 19:18:18 -0500 |
| commit | e1d67efda609d2997eb78259ecf88e2fcf3209c1 (patch) | |
| tree | 8e88388f8556f67c40c50c8ae0e1c2e4b18e2517 | |
| parent | 7e50da47a283b46cdb8fe199f28bc4b44ad340d7 (diff) | |
| parent | 0803b33a54a92ca4b741658dc5065482bf377c5d (diff) | |
Merge pull request #21 from huderlem/tools
Use devkitarm's configured tools
| -rw-r--r-- | libc/Makefile | 5 | ||||
| -rw-r--r-- | libgcc/Makefile | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libc/Makefile b/libc/Makefile index 6ab133b..f699e5c 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -1,17 +1,16 @@ +include $(DEVKITARM)/base_tools + SHELL := /bin/bash -o pipefail -AS := $(DEVKITARM)/bin/arm-none-eabi-as ASFLAGS := -mcpu=arm7tdmi CC1 := ../old_agbcc CFLAGS := -O2 -fno-builtin -CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp 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 := $(DEVKITARM)/bin/arm-none-eabi-ar # Clear the default suffixes. .SUFFIXES: diff --git a/libgcc/Makefile b/libgcc/Makefile index c9ddf52..b149037 100644 --- a/libgcc/Makefile +++ b/libgcc/Makefile @@ -1,7 +1,5 @@ +include $(DEVKITARM)/base_tools CC1 = ../old_agbcc -CPP = $(DEVKITARM)/bin/arm-none-eabi-cpp -AS = $(DEVKITARM)/bin/arm-none-eabi-as -AR = $(DEVKITARM)/bin/arm-none-eabi-ar libgcc.a: libgcc1.a libgcc2.a fp-bit.o dp-bit.o $(AR) -x libgcc1.a |