Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12678
-gerrit
commit 3a539b2bda7f1a2509e8860c8a1192912a96f1a7 Author: Martin Roth martinroth@google.com Date: Mon Dec 7 14:20:55 2015 -0700
toolchain.inc: Move nocompile around entire check, Comment endifs
Move the check for NOCOMPILE flag around the whole block. There's no need to test COMPILERFAIL if NOCOMPILE is set. Comment the endif lines to make it easier to understand.
Signed-off-by: Martin Roth martinroth@google.com Change-Id: Id7bb5ca13e6bf1cabf4b7b2ff3256b47b966bac1 --- toolchain.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/toolchain.inc b/toolchain.inc index c03881c..ef3ae16 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -162,7 +162,6 @@ $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage $(if $(shell if [ -n "$(IASL)" ]; then $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot; else echo not-coreboot; fi), \ $(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl - $(shell util/crossgcc/buildgcc -s iasl))) endif -endif ifeq ($(COMPILERFAIL),1) ifneq ($(XGCCPATH),) $(warning ) @@ -172,10 +171,12 @@ $(warning ) $(warning To build the entire coreboot toolchain: make crossgcc) ifeq ($(IASLFAIL),1) $(warning To build just IASL: make iasl) -endif +endif #($(IASLFAIL),1) $(warning For more toolchain build targets: make help_toolchain) $(warning ) $(warning *** To try to use your own toolchain, run 'make menuconfig', then select the) $(warning *** config option: General setup -> Allow building with any toolchain) $(error Note that this is NOT supported. Using it means you're on your own) -endif +endif #($(COMPILERFAIL),1) + +endif #($(NOCOMPILE),1)