summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-07-24 10:38:48 -0400
committerGitHub <noreply@github.com>2019-07-24 10:38:48 -0400
commitbb07f06fc66cd018ffdadcb8ae4c3df9b652f1ef (patch)
tree0b99ab4b27396978987c688bcebc812d0f9ae69a
parent6ff1426abed52c9642a6ccd5a6eda7210d0637e7 (diff)
Fix "arm-none-eabi-gcc not found" error (#751)
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1cb59fece..22f9cb452 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,11 @@ TOOLCHAIN := $(DEVKITARM)
ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
include $(TOOLCHAIN)/base_tools
else
-PREFIX := $(TOOLCHAIN)/bin/arm-none-eabi-
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
+PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
-CC := $(PREFIX)gcc
-AS := $(PREFIX)as
+export CC := $(PREFIX)gcc
+export AS := $(PREFIX)as
endif
export CPP := $(PREFIX)cpp
export LD := $(PREFIX)ld
@@ -42,7 +43,7 @@ MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN)
-GCC_VER := $(shell $(CC) -dumpversion)
+GCC_VER = $(shell $(CC) -dumpversion)
ifeq ($(MODERN),0)
CC1 := tools/agbcc/bin/agbcc$(EXE)
@@ -51,7 +52,7 @@ ROM := pokeemerald.gba
OBJ_DIR := build/emerald
LIBPATH := -L ../../tools/agbcc/lib
else
-CC1 := $(shell $(CC) --print-prog-name=cc1) -quiet
+CC1 = $(shell $(CC) --print-prog-name=cc1) -quiet
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -fno-aggressive-loop-optimizations -Wno-pointer-to-int-cast
ROM := pokeemerald_modern.gba
OBJ_DIR := build/modern