diff options
| author | John Wilbert Villamor <lameguy64@gmail.com> | 2020-01-06 09:11:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 09:11:51 +0800 |
| commit | e5d2799a8d2b929a3ed00e9af60a4f9a42840df3 (patch) | |
| tree | a61030dc2c433249d6a0c30ecfa3de2b296f4675 | |
| parent | a32f227dbd17fad1c4dc29201aafebd03b4fae07 (diff) | |
| parent | 15263ff19694f0a6e03eb3d32021e0121e91ab19 (diff) | |
| download | psn00bsdk-e5d2799a8d2b929a3ed00e9af60a4f9a42840df3.tar.gz | |
Merge pull request #11 from greenaddress/readme_typo
toolchain readme typo and don't set GCC_BASE if already set
| -rw-r--r-- | examples/sdk-common.mk | 7 | ||||
| -rw-r--r-- | libpsn00b/common.mk | 8 | ||||
| -rw-r--r-- | toolchain.txt | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/examples/sdk-common.mk b/examples/sdk-common.mk index 0d97555..312fda3 100644 --- a/examples/sdk-common.mk +++ b/examples/sdk-common.mk @@ -10,9 +10,14 @@ 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 GCC_BASE = /c/mipsel-unknown-elf @@ -23,5 +28,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 diff --git a/libpsn00b/common.mk b/libpsn00b/common.mk index 83b45e9..d15d4a5 100644 --- a/libpsn00b/common.mk +++ b/libpsn00b/common.mk @@ -2,9 +2,15 @@ # 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 + ifeq "$(OS)" "Windows_NT" # For Windows GCC_BASE = /c/mipsel-unknown-elf @@ -15,6 +21,8 @@ GCC_BASE = /usr/local/mipsel-unknown-elf endif +endif + # Toolchain prefix PREFIX = mipsel-unknown-elf- diff --git a/toolchain.txt b/toolchain.txt index 14807bb..f384b50 100644 --- a/toolchain.txt +++ b/toolchain.txt @@ -25,7 +25,7 @@ Before building, the following packages must be installed: Building binutils: * Download binutils source files at ftp://ftp.gnu.org, choose a version you - with to use with PSn00bSDK. + wish to use with PSn00bSDK. * Extract the contents of the archive, preferably to a directory called gcc for example. * Create a directory named binutils-build inside the gcc directory. |