X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=bootstrap.sh;h=f198f6f6ad5526b5045c654e5319a4f05922ce8d;hb=6382743d26f8d5bb10a53cb907659bee6614b549;hp=48a4f206bb75b673280bc5fc331dc8ec2608b4e5;hpb=6e02286dcbd62b8f5ef56987c2298d54b689ad9c;p=builder.git

diff --git a/bootstrap.sh b/bootstrap.sh
index 48a4f20..f198f6f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,8 +14,12 @@ if [ "$MACHINE" = "x86_64" ]; then
 else
 	MULTIARCH="i386-linux-gnu"
 fi
-if [ "$SYSTEM" = "Darwin" ]; then
-	COMPILER="clang++"
+if [ "$SYSTEM" = "Darwin" -o "$SYSTEM" = "FreeBSD" ]; then
+	if which clang++ >/dev/null; then
+		COMPILER="clang++"
+	else
+		COMPILER="g++"
+	fi
 else
 	COMPILER="g++"
 fi
@@ -42,6 +46,18 @@ while [ "$1" ]; do
 	--keep-temp)
 		KEEP_TEMP=yes
 		;;
+	--compiler)
+		shift
+		COMPILER="$1"
+		CUSTOM_COMPILER=yes
+		;;
+	--compiler=*)
+		COMPILER="${1#--compiler=}"
+		CUSTOM_COMPILER=yes
+		;;
+	--debug)
+		DEBUG=-g
+		;;
 	*)
 		echo "Unknown option $1"
 		exit 1
@@ -98,7 +114,7 @@ for i in $sources; do
 	if [ -d "$dir/unix" ]; then
 		flags="$flags -iquote $dir -iquote $dir/unix"
 	fi
-	$COMPILER -c $i -o $obj $flags
+	$COMPILER -c $DEBUG $i -o $obj $flags
 	objects="$objects $obj"
 done
 $COMPILER $objects -o builder-stage1 $LIBS
@@ -113,4 +129,7 @@ ARGS=
 if [ "$PREFIX" ]; then
 	ARGS="$ARGS --prefix='$PREFIX'"
 fi
+if [ "$CUSTOM_COMPILER" = "yes" ]; then
+	ARGS="$ARGS CXX=$COMPILER"
+fi
 eval "./builder-stage1 $ARGS"