From e2e77805e5eb316d93d89de654690d79608118d6 Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Sun, 8 Dec 2019 19:50:08 +0100 Subject: don't set GCC_BASE if already set (useful for in home toolchain) --- examples/sdk-common.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'examples') diff --git a/examples/sdk-common.mk b/examples/sdk-common.mk index 0d97555..fa4da20 100644 --- a/examples/sdk-common.mk +++ b/examples/sdk-common.mk @@ -13,6 +13,8 @@ LIBDIRS = -L../../libpsn00b GCC_VERSION = 7.4.0 +ifndef GCC_BASE + ifeq "$(OS)" "Windows_NT" # For Windows GCC_BASE = /c/mipsel-unknown-elf @@ -23,5 +25,7 @@ GCC_BASE = /usr/local/mipsel-unknown-elf endif +endif + LIBDIRS += -L$(GCC_BASE)/lib/gcc/mipsel-unknown-elf/$(GCC_VERSION) INCLUDE += -I$(GCC_BASE)/lib/gcc/mipsel-unknown-elf/$(GCC_VERSION)/include -- cgit v1.2.3 From 15263ff19694f0a6e03eb3d32021e0121e91ab19 Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Sun, 8 Dec 2019 19:59:58 +0100 Subject: don't set the version if already set --- examples/sdk-common.mk | 3 +++ libpsn00b/common.mk | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'examples') diff --git a/examples/sdk-common.mk b/examples/sdk-common.mk index fa4da20..312fda3 100644 --- a/examples/sdk-common.mk +++ b/examples/sdk-common.mk @@ -10,9 +10,12 @@ INCLUDE = -I../../libpsn00b/include # Library directories, last entry must point toolchain libraries LIBDIRS = -L../../libpsn00b +ifndef GCC_VERSION GCC_VERSION = 7.4.0 +endif + ifndef GCC_BASE ifeq "$(OS)" "Windows_NT" # For Windows diff --git a/libpsn00b/common.mk b/libpsn00b/common.mk index 1733166..d15d4a5 100644 --- a/libpsn00b/common.mk +++ b/libpsn00b/common.mk @@ -2,8 +2,12 @@ # You may need to modify these values to match with your toolchain setup. # GCC version +ifndef GCC_VERSION + GCC_VERSION = 7.4.0 +endif + # GCC base paths ifndef GCC_BASE -- cgit v1.2.3