diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 19:43:34 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-12-30 20:22:56 -0600 |
| commit | bd1b2f511edfb30610b8d88f66f80323b3cc0aee (patch) | |
| tree | ed1f52967774b68687c7f26577f47164f6533a45 | |
| parent | 07f3f62b18908f046a14e08255c8f7ecb06f63d4 (diff) | |
Check for $(DEVKITARM) first before checking for $(DEVKITARM)/bin
| -rw-r--r-- | libc/Makefile | 13 | ||||
| -rw-r--r-- | libgcc/Makefile | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/libc/Makefile b/libc/Makefile index 2b60a95..d9de489 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -1,6 +1,15 @@ -ifneq (,$(wildcard $(DEVKITARM)/bin)) -include $(DEVKITARM)/base_tools +ifneq (,$(DEVKITARM)) + ifneq (,$(wildcard $(DEVKITARM)/bin)) + include $(DEVKITARM)/base_tools + DKA_EXISTS=1 + else + DKA_EXISTS=0 + endif else +DKA_EXISTS=0 +endif + +ifneq ($(DKA_EXISTS),1) PREFIX := arm-none-eabi- export AR := $(PREFIX)ar export AS := $(PREFIX)as diff --git a/libgcc/Makefile b/libgcc/Makefile index 1aec873..6461d8e 100644 --- a/libgcc/Makefile +++ b/libgcc/Makefile @@ -1,6 +1,15 @@ -ifneq (,$(wildcard $(DEVKITARM)/bin)) -include $(DEVKITARM)/base_tools +ifneq (,$(DEVKITARM)) + ifneq (,$(wildcard $(DEVKITARM)/bin)) + include $(DEVKITARM)/base_tools + DKA_EXISTS=1 + else + DKA_EXISTS=0 + endif else +DKA_EXISTS=0 +endif + +ifneq ($(DKA_EXISTS),1) PREFIX := arm-none-eabi- export AR := $(PREFIX)ar export AS := $(PREFIX)as |