[Devil-linux-commit] build/scripts gcc,1.32,1.33

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28958

Modified Files:
	gcc 
Log Message:
sync command with hlfs book


Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- gcc	29 Jan 2005 20:40:25 -0000	1.32
+++ gcc	5 Feb 2005 15:52:49 -0000	1.33
@@ -67,26 +67,32 @@
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
 		    # and now make sure we use SSP when compiling
 		    # thanks to Robert Connolly
-		    perl -pi -e 's@\*cc1:\n@$_%(cc1_ssp) @;' $(gcc --print-file specs)
-		    perl -pi -e 's@\*cc1plus:\n@$_%(cc1_ssp) @;' $(gcc --print-file specs)
-		    echo '*cc1_ssp:
+perl -pi -e 's@\*cc1:\n@$_%(cc1_ssp) @;' \
+$(gcc --print-file specs) &&
+perl -pi -e 's@\*cc1plus:\n@$_%(cc1_ssp) @;' \
+$(gcc --print-file specs) &&
+echo '*cc1_ssp:
 %{!fno-stack-protector*: -fstack-protector-all}
 ' >> $(gcc --print-file specs)
+
 		fi
 
-		perl -pi -e 's@\*cc1:\n@$_%(cc1_pie) @;' $(gcc --print-file specs) 
-		perl -pi -e 's@\*cc1plus:\n@$_%(cc1_pie) @;' $(gcc --print-file specs) 
-		perl -pi -e 's@%{pie:-pie}@%(link_pie)@;' $(gcc --print-file specs) 
-		perl -pi -e 's@pie:@!no-pie|pie:@g;' $(gcc --print-file specs) 
-		perl -pi -e 's@\*cpp:\n@$_%(cpp_pie) @;' $(gcc --print-file specs) 
-		echo '*cpp_pie:
+perl -pi -e 's@\*cc1:\n@$_%(cc1_pie) @;' \
+        $(gcc --print-file specs) &&
+perl -pi -e 's@\*cc1plus:\n@$_%(cc1_pie) @;' \
+        $(gcc --print-file specs) &&
+perl -pi -e 's@%{pie:-pie}@%(link_pie)@;' \
+                $(gcc --print-file specs) &&
+perl -pi -e 's@pie:@!no-pie|pie:@g;' $(gcc --print-file specs) &&
+perl -pi -e 's@\*cpp:\n@$_%(cpp_pie) @;' $(gcc --print-file specs) &&
+echo '*cpp_pie:
 %{!static:%{!no-pie:%{!pie: -D__PIC__ -DPIC}}}
 ' >> $(gcc --print-file specs) &&
-		echo '*cc1_pie:
+echo '*cc1_pie:
 %{!static:%{!no-pie:%{!pie: -fPIC}}}
 ' >> $(gcc --print-file specs) &&
-		echo '*link_pie:
-%{pie:-pie}%{!no-pie:%{!static:%{!Bstatic:%{!i:%{!r:%{!shared:%{!Bshareable:%{!pie: -pie}}} -z now -z relro -z combreloc}}}}}
+echo '*link_pie:
+%{pie:-pie}%{!no-pie:%{!static:%{!Bstatic:%{!i:%{!r: -z now -z relro -z combreloc %{!shared:%{!Bshareable:%{!pie: -pie}}}}}}}}
 ' >> $(gcc --print-file specs)
 		;;