X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=t%2Flogs%2Fdebian;h=bd3c89fafa2df12028efbfec7171294721602c4d;hp=9665e8fa609c033390bd4ca8feafc6b231a5da99;hb=768e3101e9e4e22e0d775ca1191549d825b679d3;hpb=50b731db501c79ad33cb40845c16638703a4ea15

diff --git a/t/logs/debian b/t/logs/debian
index 9665e8f..bd3c89f 100644
--- a/t/logs/debian
+++ b/t/logs/debian
@@ -1,7 +1,23 @@
-Build-Depends: .., gcc (>= 4:4.4.3), g++ (>= 4:4.4.3), ...
+Filtered Build-Depends: .., gcc (>= 4:4.4.3), g++ (>= 4:4.4.3), ...
+Toolchain package versions: ...
+Package versions: ...
 
 dpkg-buildpackage: source package test
 
-dh_auto_configure -- CFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security" CPPFLAGS="-D_FORTIFY_SOURCE=2" CXXFLAGS="-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security" LDFLAGS="-Wl,-z,relro -Wl,-z,defs -Wl,--as-needed" ...
+dh_auto_configure -- CFLAGS="-g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security" CPPFLAGS="-D_FORTIFY_SOURCE=2" CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security" LDFLAGS="-Wl,-z,relro -Wl,-z,defs -Wl,--as-needed" ...
 
-gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -c test.c
+gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -Wall -c test.c
+
+# `...` isn't expanded by the Makefile, assume dpkg-buildflags returns the
+# correct flags.
+gcc -c `dpkg-buildflags --get CFLAGS` test.c
+g++ -c `dpkg-buildflags --get CXXFLAGS` test.cc
+gcc -c `dpkg-buildflags --get LDFLAGS` test.c
+gcc -c `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS` test.c
+g++ -c `dpkg-buildflags --get CXXFLAGS` `dpkg-buildflags --get CPPFLAGS` test.cc
+gcc -o test test.o `dpkg-buildflags --get LDFLAGS`
+gcc -o test test.o `dpkg-buildflags --get CFLAGS`
+
+Build finished at 20120308-1648
+
+ Depends: libc6 (>= 2.7), gcc