1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 29ee19035..b50c645bc 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 PROG=busybox
-VERSION=0.39
+VERSION=0.40
 BUILDTIME=$(shell date "+%Y%m%d-%H%M")
 # Comment out the following to make a debuggable build
@@ -31,8 +31,8 @@ DOSTATIC=false
 #This will choke on a non-debian system
 ARCH=`uname -m | sed -e 's/i.86/i386/' | sed -e 's/sparc.*/sparc/'`
-GCCMAJVERSION=`$(CC) --version | sed -n "s/^\([0-9]\)\.\([0-9].*\)[\.].*/\1/p"`
+GCCMAJVERSION=$(shell $(CC) --version | sed -n "s/^\([^\.]*\).*/\1/p" )
-GCCMINVERSION=`$(CC) --version | sed -n "s/^\([0-9]\)\.\([0-9].*\)[\.].*/\2/p"`
+GCCMINVERSION=$(shell $(CC) --version | sed -n "s/^[^\.]*\.\([^\.]*\)[\.].*/\1/p" )
 GCCSUPPORTSOPTSIZE=$(shell \
 if ( test $(GCCMAJVERSION) -eq 2 ) ; then \

diff --git a/Makefile b/Makefile index 29ee19035..b50c645bc 100644 --- a/Makefile +++ b/Makefile
@@ -17,7 +17,7 @@
17		17
18		18
19	PROG=busybox	19	PROG=busybox
20	VERSION=0.39	20	VERSION=0.40
21	BUILDTIME=$(shell date "+%Y%m%d-%H%M")	21	BUILDTIME=$(shell date "+%Y%m%d-%H%M")
22		22
23	# Comment out the following to make a debuggable build	23	# Comment out the following to make a debuggable build
@@ -31,8 +31,8 @@ DOSTATIC=false
31	#This will choke on a non-debian system	31	#This will choke on a non-debian system
32	ARCH=`uname -m \| sed -e 's/i.86/i386/' \| sed -e 's/sparc.*/sparc/'`	32	ARCH=`uname -m \| sed -e 's/i.86/i386/' \| sed -e 's/sparc.*/sparc/'`
33		33
34	GCCMAJVERSION=`$(CC) --version \| sed -n "s/^\([0-9]\)\.\([0-9].\)[\.]./\1/p"`	34	GCCMAJVERSION=$(shell $(CC) --version \| sed -n "s/^\([^\.]\)./\1/p" )
35	GCCMINVERSION=`$(CC) --version \| sed -n "s/^\([0-9]\)\.\([0-9].\)[\.]./\2/p"`	35	GCCMINVERSION=$(shell $(CC) --version \| sed -n "s/^[^\.]\.\([^\.]\)[\.].*/\1/p" )
36		36
37	GCCSUPPORTSOPTSIZE=$(shell \	37	GCCSUPPORTSOPTSIZE=$(shell \
38	if ( test $(GCCMAJVERSION) -eq 2 ) ; then \	38	if ( test $(GCCMAJVERSION) -eq 2 ) ; then \