From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 12 Mar 2023 11:30:27 +0000 (+0200)
Subject: Some minor touch-up to the bootstrap script
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=7bd3e51a9ec3be0d3670a36866e41517c3b7148a;p=builder.git

Some minor touch-up to the bootstrap script
---

diff --git a/bootstrap.sh b/bootstrap.sh
index b8c8a7a..b647568 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -67,7 +67,7 @@ while [ "$1" ]; do
 done
 
 if [ -z "$LIBPATH" -o "${LIBPATH%%/*}" ]; then
-	LIBPATH=`pwd`/${LIBPATH:-..}
+	LIBPATH="$PWD/${LIBPATH:-..}"
 fi
 
 rm -rf "$INCLUDEDIR"
@@ -101,8 +101,7 @@ for i in $REQUIRED; do
 			findargs="$findargs -mindepth 1 ( -type d ! ( $check_overlay ) -prune -false ) -o "
 		fi
 
-		headers=`find $findargs -name '*.h'`
-		for j in $headers; do
+		for j in `find $findargs -name '*.h'`; do
 			rel=${j#$path/source/}
 			comp=${rel%%/*}
 			if [ "$comp" = "$rel" ]; then
@@ -137,9 +136,11 @@ for i in $sources; do
 			break
 		fi
 	done
+	echo "Compiling $i"
 	$COMPILER -c $DEBUG $i -o $obj $flags
 	objects="$objects $obj"
 done
+echo "Linking builder-stage1"
 $COMPILER $objects -o builder-stage1 $LIBS
 
 if [ "$KEEP_TEMP" != "yes" ]; then