X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Ferrs12;h=a1ef03504026ebb48a51f259b1617683985f4290;hp=4970709604f82f19d6349fc7fe1b00f106139b7c;hb=9261c15af132a6cdc380f6bae89cdc8e35171391;hpb=fb4e461bad4c2423f7c7377d06d0e18fe7b45553

diff --git a/bin/errs12 b/bin/errs12
index 4970709..a1ef035 100755
--- a/bin/errs12
+++ b/bin/errs12
@@ -18,7 +18,7 @@ if gcc --version|perl -ne 'exit(!(/(\d+)\.(\d+)/&&($1>4||($1==4&&$2>=7))));';the
 else
   debug="-g2"
 fi
-ldflags="-lmcheck"
+mcheck="-lmcheck"
 fast=false
 readline=""
 
@@ -65,7 +65,12 @@ do
 	if [ "$1" = "-s" ];then
 		# -O0 is important to override GCC -O2.
 		debug="-O0 -s"
-		#ldflags=""
+		shift
+		continue
+	fi
+
+	if [ "$1" = "--nomcheck" ];then
+		mcheck=""
 		shift
 		continue
 	fi
@@ -114,10 +119,12 @@ rm -f errs1.ok
 
 	test -z "$CC" && CC=gcc
 	: >errs1.c
-	for flags in													\
-		"$debug -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4"	\
-		"$debug -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions"						\
-		""													\
+	# -Wp,-D_FORTIFY_SOURCE=2: /usr/include/features.h:329:3: error: #warning _FORTIFY_SOURCE requested but disabled [-Werror=cpp]
+	for flags in																	\
+		"$debug -pipe -Wall -fexceptions -fstack-protector --param=ssp-buffer-size=4 -ftrack-macro-expansion=0 -fno-diagnostics-show-caret"	\
+		"$debug -pipe -Wall -fexceptions -fstack-protector --param=ssp-buffer-size=4"								\
+		"$debug -pipe -Wall -fexceptions"													\
+		""																	\
 		;do
 		if [ -z "$flags" ];then
 			rm -f errs1.c
@@ -138,7 +145,7 @@ rm -f errs1.ok
 	export GCJFLAGS="$flags"
 	export CFLAGS_FOR_TARGET="$flags"
 	export CXXFLAGS_FOR_TARGET="$flags"
-	export LDFLAGS="$ldflags"
+	export LDFLAGS="$mcheck"
 
 	time nice "$configure" $target $targets $customss $readline --enable-debug --disable-sim --enable-gold --enable-plugins $maintainer $werror --with-separate-debug-dir=/usr/lib/debug "$@"