From 66e5cd88c077f3625259925cd715857913290438 Mon Sep 17 00:00:00 2001
From: Matt Jenkins <matt@majenko.co.uk>
Date: Thu, 14 Jul 2016 00:04:45 +0100
Subject: [PATCH] Fixed UECIDE compiler location detection

---
 sys/pic32/gcc-config.mk | 6 ++++--
 target.mk               | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sys/pic32/gcc-config.mk b/sys/pic32/gcc-config.mk
index 85711b3..0806fc2 100644
--- a/sys/pic32/gcc-config.mk
+++ b/sys/pic32/gcc-config.mk
@@ -3,8 +3,10 @@
 # Use UECIDE package from http://uecide.org/download
 ifndef MIPS_GCC_PREFIX
     ifdef UECIDE
-        MIPS_GCC_PREFIX = $(UECIDE)/compilers/pic32-tools-452/bin/pic32-
-        MIPS_GCC_FORMAT = elf32-tradlittlemips
+		ifeq ($(UECIDE)/compilers/pic32-tools-452/bin/pic32-gcc,$(wildcard $(UECIDE)/compilers/pic32-tools-452/bin/pic32-gcc))
+			MIPS_GCC_PREFIX = $(UECIDE)/compilers/pic32-tools-452/bin/pic32-
+			MIPS_GCC_FORMAT = elf32-tradlittlemips
+		endif
     endif
 endif
 
diff --git a/target.mk b/target.mk
index 2d17ed6..9e32dd7 100644
--- a/target.mk
+++ b/target.mk
@@ -7,9 +7,11 @@ VERSION     = $(RELEASE)-$(BUILD)
 # chipKIT PIC32 compiler from UECIDE
 ifdef UECIDE
 ifndef GCCPREFIX
-    GCCPREFIX   = ${UECIDE}/compilers/pic32-tools-452/bin/pic32-
-    LDFLAGS     = -Wl,--oformat=elf32-tradlittlemips
-    INCLUDES    = -I${UECIDE}/compilers/pic32-tools-452/lib/gcc/pic32mx/4.5.2/include
+	ifeq ($(UECIDE)/compilers/pic32-tools-452/bin/pic32-gcc,$(wildcard $(UECIDE)/compilers/pic32-tools-452/bin/pic32-gcc))
+		GCCPREFIX   = ${UECIDE}/compilers/pic32-tools-452/bin/pic32-
+		LDFLAGS     = -Wl,--oformat=elf32-tradlittlemips
+		INCLUDES    = -I${UECIDE}/compilers/pic32-tools-452/lib/gcc/pic32mx/4.5.2/include
+	endif
 endif
 endif