summaryrefslogtreecommitdiff
path: root/berry_fix/payload/Makefile
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-10-02 12:40:00 -0400
committerGriffinR <griffin.richards@comcast.net>2019-10-02 12:40:00 -0400
commit2ac3ad3e607c0c54d28223825b39b9e695022b5c (patch)
tree3bff8424909b1038b72ca4b310f12f9e0835088b /berry_fix/payload/Makefile
parent67152b92424419a470ed2bb0cf5e5f8a8ced38de (diff)
parentcb528cb543ab98a58ba2b5a78524c3542ed80f62 (diff)
Review changes for #819 and merge
Diffstat (limited to 'berry_fix/payload/Makefile')
-rw-r--r--berry_fix/payload/Makefile26
1 files changed, 24 insertions, 2 deletions
diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile
index 63e326724..a121fda93 100644
--- a/berry_fix/payload/Makefile
+++ b/berry_fix/payload/Makefile
@@ -1,7 +1,29 @@
-include $(DEVKITARM)/base_tools
+TOOLCHAIN := $(DEVKITARM)
+COMPARE ?= 0
+
+ifeq ($(CC),)
+HOSTCC := gcc
+else
+HOSTCC := $(CC)
+endif
+
+ifeq ($(CXX),)
+HOSTCXX := g++
+else
+HOSTCXX := $(CXX)
+endif
+
+ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
+include $(TOOLCHAIN)/base_tools
+else
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
+PREFIX := arm-none-eabi-
+OBJCOPY := $(PREFIX)objcopy
+export CC := $(PREFIX)gcc
+export AS := $(PREFIX)as
+endif
export CPP := $(PREFIX)cpp
export LD := $(PREFIX)ld
-COMPARE ?= 0
ifeq ($(OS),Windows_NT)
EXE := .exe