Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-bugfix

4 files changed, 16 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index cd5b619db9d..a1158d1c051 100644
--- a/Makefile
+++ b/Makefile
@@ -442,7 +442,7 @@ export KBUILD_DEFCONFIG
 config %config: scripts_basic outputmakefile FORCE
         $(Q)mkdir -p include/linux
         $(Q)$(MAKE) $(build)=scripts/kconfig $@
-        $(Q)$(MAKE) .kernelrelease
+        $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
 
 else
 # ===========================================================================
diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index ea65d585cf5..ee114699ef8 100644
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -119,7 +119,7 @@ $(SRC_ARCH)/.links:
         @ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib
         @ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch
         @ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
-        @ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
+        @ln -sfn $(SRC_ARCH)/$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
         @touch $@
 
 # Create link to sub arch includes
diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
index fae3e29fc92..bbf4887cff7 100644
--- a/scripts/kconfig/lxdialog/Makefile
+++ b/scripts/kconfig/lxdialog/Makefile
@@ -2,8 +2,11 @@
 #
 
 check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh
-HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES  := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+
+# Use reursively expanded variables so we do not call gcc unless
+# we really need to do so. (Do not call gcc as part of make mrproper)
+HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
  
 HOST_EXTRACFLAGS += -DLOCALE 
 
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 448e353923f..120d624e672 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,17 +4,17 @@
 # What library to link
 ldflags()
 {
-        echo "main() {}" | $cc -lncursesw -xc - -o /dev/null 2> /dev/null
+        $cc -print-file-name=libncursesw.so | grep -q /
         if [ $? -eq 0 ]; then
                 echo '-lncursesw'
                 exit
         fi
-        echo "main() {}" | $cc -lncurses -xc - -o /dev/null 2> /dev/null
+        $cc -print-file-name=libncurses.so | grep -q /
         if [ $? -eq 0 ]; then
                 echo '-lncurses'
                 exit
         fi
-        echo "main() {}" | $cc -lcurses -xc - -o /dev/null 2> /dev/null
+        $cc -print-file-name=libcurses.so | grep -q /
         if [ $? -eq 0 ]; then
                 echo '-lcurses'
                 exit
@@ -36,10 +36,13 @@ ccflags()
         fi
 }
 
-compiler=""
+# Temp file, try to clean up after us
+tmp=.lxdialog.tmp
+trap "rm -f $tmp" 0 1 2 3 15
+
 # Check if we can link to ncurses
 check() {
-        echo "main() {}" | $cc -xc - -o /dev/null 2> /dev/null
+        echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
         if [ $? != 0 ]; then
                 echo " *** Unable to find the ncurses libraries."          1>&2
                 echo " *** make menuconfig require the ncurses libraries"  1>&2
@@ -59,6 +62,7 @@ if [ $# == 0 ]; then
         exit 1
 fi
 
+cc=""
 case "$1" in
         "-check")
                 shift