diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 13:48:32 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-12-30 20:22:56 -0600 |
| commit | 07f3f62b18908f046a14e08255c8f7ecb06f63d4 (patch) | |
| tree | ef70ccfc8d1b1647e91c45fec3fa4ce771830336 | |
| parent | 293e28b85ddfa9acef28bbfb9c0c5f6faee7e831 (diff) | |
Check $(DEVKITARM)/bin instead of $(DEVKITARM)/base_tools
Rationale: uninstalling devkitarm doesn't remove base_tools, but removes bin. If the binaries exist but not base_tools, then the user clearly wants to install using dkA. Otherwise, if base_tools exists but not binaries, it is possible that the user wants to use standalone arm-none-eabi binaries.
| -rw-r--r-- | libc/Makefile | 2 | ||||
| -rw-r--r-- | libgcc/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/Makefile b/libc/Makefile index c377f1a..2b60a95 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -1,4 +1,4 @@ -ifneq (,$(wildcard $(DEVKITARM)/base_tools)) +ifneq (,$(wildcard $(DEVKITARM)/bin)) include $(DEVKITARM)/base_tools else PREFIX := arm-none-eabi- diff --git a/libgcc/Makefile b/libgcc/Makefile index 721d9d2..1aec873 100644 --- a/libgcc/Makefile +++ b/libgcc/Makefile @@ -1,4 +1,4 @@ -ifneq (,$(wildcard $(DEVKITARM)/base_tools)) +ifneq (,$(wildcard $(DEVKITARM)/bin)) include $(DEVKITARM)/base_tools else PREFIX := arm-none-eabi- |