Skip to contentSkip to conversation

kbuild: fix cc-version

PATCH New Sam Ravnborg 1 participant 1 message Aug 24, 2004 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: fix cc-version

When consolidating gcc version handling a bug were introduced. It made make spit out

/bin/sh: line 1: [: too many arguments

when building the kernel.
As a side-effect all gcc version checks were failing.

Patch below.

Linus - please pull from
bk://linux-sam.bkbits.net/kbuild

[Only cset pushed since last update].

Sam

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/08/24 22:36:35+02:00 [email protected]
# kbuild: fix cc-version
#
# cc-version needs to use $(shell to get the gcc version.
# Before if gave the following error when building the kernel:
#
# /bin/sh: line 1: [: too many arguments
#
# And all checks for gcc version were broken.
#
# Signed-off-by: Sam Ravnborg <[email protected]>
#
# Makefile
# 2004/08/24 22:34:30+02:00 [email protected] +2 -2
# fix cc-version
#

Makefile +2 -2
diff -Nru a/Makefile b/Makefile
@@ -279,8 +279,8 @@
 
 # cc-version
 # Usage gcc-ver := $(call cc-version $(CC))
-cc-version = $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \
-              $(if $(1), $(1), $(CC))
+cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \
+              $(if $(1), $(1), $(CC)))
 
 
 # Look for make include files relative to root of kernel src