X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=bin%2Ferrs1;h=37d82907d9e5957dc2d71fe267853b8d3417ac9f;hb=263e1014643f10a9307951f7a1755d820cb9a109;hp=5637f9d36da636d1a288047b34ce469506993db3;hpb=34369c9a9d461b0ad58813248a02ace048b70fd7;p=nethome.git

diff --git a/bin/errs1 b/bin/errs1
index 5637f9d..37d8290 100755
--- a/bin/errs1
+++ b/bin/errs1
@@ -1,22 +1,55 @@
 #! /bin/sh
 # $Id$
 
-configure="./configure"
-if [ "${1#*/configure}" != "$1" ];then
-	configure="$1"
-	shift
-fi
 customss="--enable-static --disable-shared"
 if [ "$1" = "--origss" ];then
 	customss=
 	shift
 fi
+
+customm="-m64"
+if [ "$1" = "--origm" ];then
+	customm=
+	shift
+fi
+
+configure="./configure"
+if [ "${1#*/configure}" != "$1" ];then
+	configure="$1"
+	shift
+fi
+
 (
 	set -ex
 	rm -f config.cache
-	flags="-ggdb2"
+	test -z "$CC" && CC=gcc
+	: >errs1.c
+	for flags in													\
+		"-ggdb2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4"	\
+		"-ggdb2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions"						\
+		""													\
+		;do
+		if [ -z "$flags" ];then
+			rm -f errs1.c
+			echo >&2 "flags error"
+			exit 1
+		fi
+		"$CC" $flags -c errs1.c -o /dev/null && break
+	done
+	if test -n "$customm" && "$CC" $customm -c errs1.c -o /dev/null;then
+		flags="$customm $flags"
+	fi
+	rm -f errs1.c
 	export CFLAGS="$flags"
 	export CXXFLAGS="$flags"
 	export GCJFLAGS="$flags"
-	time nice "$configure" $customss --enable-debug "$@"
+
+	# sourceware.org?
+	if test -f `dirname $configure`/bfd/elf64-x86-64.c;then
+		maintainer=""
+	else
+		maintainer="--enable-maintainer-mode"
+	fi
+
+	time nice "$configure" $customss --enable-debug $maintainer "$@"
 	) 2>&1|tee errs1