2 files changed, 1 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 7431c283f15b..788111d21559 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
 export KBUILD_BUILDHOST := $(SUBARCH)
 ARCH            ?= $(SUBARCH)
-CROSS_COMPILE   ?=
 CROSS_COMPILE   ?= $(CONFIG_CROSS_COMPILE:"%"=%)
 
 # Architecture as present in compile.h
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 64a9cb5556cd..e90a91cc5185 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -86,7 +86,7 @@ scm_version()
 
         # Check for mercurial and a mercurial repo.
         if hgid=`hg id 2>/dev/null`; then
-                tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+                tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
 
                 # Do we have an untagged version?
                 if [ -z "$tag" -o "$tag" = tip ]; then