ar9170-fw: Use self-built toolchain by default
PATCH 2/2 ar9170-fw: Use self-built toolchain by default
---
Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Makefile +1 -1
@@ -1,7 +1,7 @@ # Type is AP or STA TYPE ?= STA -PFX ?= /usr/share/gnush_v0901_elf-1/bin/sh-elf- +PFX ?= $(shell pwd)/toolchain/inst/bin/sh-elf- CC = $(PFX)gcc LD = $(PFX)ld AS = $(PFX)as
Quoted 11 lines · Jan Kiszka
Signed-off-by Jan Kiszka <[email protected]>---
Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)Makefile +0
-0
Makefile line 4
Quoted 5 lines
Makefile +1
-1@@ -1,7 +1,7 @@ # Type is AP or STA TYPE ?= STA -PFX ?= /usr/share/gnush_v0901_elf-1/bin/sh-elf- +PFX ?= $(shell pwd)/toolchain/inst/bin/sh-elf-
This will fail in strange ways if the user doesn't first manually build the toolchain... It does that if you don't have it installed, but it would be nice to tell them to build it?
johannes
Quoted 15 lines · Johannes Berg
Quoted 14 lines · Jan Kiszka
Signed-off-by Jan Kiszka <[email protected]>---
Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)Makefile +0
-0@@ -1,7 +1,7 @@ # Type is AP or STA TYPE ?= STA
Quoted 7 lines
Makefile line 4
Quoted 2 lines
Makefile +1
-1-PFX ?= /usr/share/gnush_v0901_elf-1/bin/sh-elf- +PFX ?= $(shell pwd)/toolchain/inst/bin/sh-elf-This will fail in strange ways if the user doesn't first manually build the toolchain... It does that if you don't have it installed, but it would be nice to tell them to build it?
What about this? There are probably smarter ways to achieve this, but I'm not speaking fluently 'make'.
---------->
Switch the default to our own toolchain and provide a hint in case it's missing or the provided PFX does not point to a gcc.
---
Makefile | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
Makefile +7 -5
@@ -1,11 +1,13 @@ # Type is AP or STA TYPE ?= STA -PFX ?= /usr/share/gnush_v0901_elf-1/bin/sh-elf- -CC = $(PFX)gcc -LD = $(PFX)ld -AS = $(PFX)as -OBJCOPY = $(PFX)objcopy +PFX ?= $(shell pwd)/toolchain/inst/bin/sh-elf- +VALID_PFX = $(if $(wildcard $(PFX)gcc), $(PFX), \ + $(error Error: sh2 gcc not found. To build your own, invoke 'make -C toolchain'.)) +CC = $(VALID_PFX)gcc +LD = $(VALID_PFX)ld +AS = $(VALID_PFX)as +OBJCOPY = $(VALID_PFX)objcopy # CPU is a Little endian sh2a-nofpu-or-sh3-nommu CPU = -m2
Quoted 2 lines · Jan Kiszka
What about this? There are probably smarter ways to achieve this, but I'm not speaking fluently 'make'.
Seems fine, thanks. I'll test both your patches and then merge them.
johannes