Index: build.sh
===================================================================
--- build.sh	(revision 56)
+++ build.sh	(working copy)
@@ -3,31 +3,30 @@
 #ALLCLEAN=1
 
 OS=`uname -s`
+HOSTCC=gcc
+
 if [ "$OS" == "Darwin" -o "${OS:0:6}" == "CYGWIN" ]; then
-    MAKEFLAGS="			\
-	AS=i386-elf-as		\
-	CC=i386-elf-gcc		\
-	AR=i386-elf-ar		\
-	LD=i386-elf-ld		\
-	STRIP=i386-elf-strip	\
-	NM=i386-elf-nm		\
-	HOSTCC=gcc		\
-	-j
-	"
+    AS=i386-elf-as
+	CC=i386-elf-gcc
+	AR=i386-elf-ar
+	LD=i386-elf-ld
+	STRIP=i386-elf-strip
+	NM=i386-elf-nm
 fi
+
 if [ "$OS" == "Linux" ]; then
-MAKEFLAGS='CC="gcc -m32" LD="ld -b elf32-i386" HOSTCC="gcc"'
+    CC=gcc
+    LD='ld -b elf32-i386'
 fi
 
 if [ "$ALLCLEAN" != "" -o ! -r libpayload/build/lib/libpayload.a ]; then
   cd libpayload
   make clean
   make defconfig
-  make $MAKEFLAGS
+  make
   cd ..
 fi
 
 make distclean
 make defconfig
-make $MAKEFLAGS
-
+make
Index: i386/timer.c
===================================================================
--- i386/timer.c	(revision 56)
+++ i386/timer.c	(working copy)
@@ -35,5 +35,3 @@
 	t=t/1000;
 	return (int)t;
 }
-
-