From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 8 Feb 2007 04:24:25 +0000 (-0800)
Subject: kbuild: make $(checker-shell ) strip spaces around the result
X-Git-Tag: v2.6.21-rc2~42^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c4184f117af7441fb83bc413d2214d92920e0289;p=linux-2.6-omap-h63xx.git

kbuild: make $(checker-shell ) strip spaces around the result

It looks like GNU make version 3.80 (but apparently not 3.81) adds
leading whitespace to the result of the checker-shell execution.  This
strips them off explicitly.

Also, don't bother symlinking the output file to /dev/null.  It's likely
as expensive as just writing the temp-file, and we need to remove it
anyway afterwards.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index d65c40331e6..8d7eabf238c 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -60,17 +60,16 @@ endef
 # Usage: option = $(call checker-shell,$(CC)...-o $$OUT,option-ok,otherwise)
 # Exit code chooses option. $$OUT is safe location for needless output.
 define checker-shell
+ $(strip
   $(shell set -e; \
     DIR=$(KBUILD_EXTMOD); \
     cd $${DIR:-$(objtree)}; \
     OUT=$$PWD/.$$$$.null; \
-    \
-    ln -s /dev/null $$OUT; \
     if $(1) >/dev/null 2>&1; \
       then echo "$(2)"; \
       else echo "$(3)"; \
     fi; \
-    rm -f $$OUT)
+    rm -f $$OUT))
 endef
 
 # as-option