Check for $(DEVKITARM) first before checking for $(DEVKITARM)/bin

pizza2004 · Dec 31, 2020 · bd1b2f5 · bd1b2f5
1 parent 07f3f62
commit bd1b2f5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git 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
@@ -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