Description: Ensure hardening options are consistently applied
 Should be upstreamed.
 .
 cbmc (5.84.0-11) unstable; urgency=low
 .
   * Disable more tests with portability problems
Author: Michael Tautschnig <mt@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2023-06-28

--- cbmc-5.84.0.orig/regression/ansi-c/Makefile
+++ cbmc-5.84.0/regression/ansi-c/Makefile
@@ -23,10 +23,10 @@ endif
 endif
 
 test:
-	if which clang ; then \
+	@if which clang ; then \
 	  ../test.pl -e -p -c "$(exe) --native-compiler clang" $(excluded_tests) ; \
 	fi
-	if which gcc ; then \
+	@if which gcc ; then \
 	  ../test.pl -e -p -c "$(exe) --native-compiler gcc" $(excluded_tests) \
 		  -X fake-gcc-version -X clang-only && \
 	  ../test.pl -e -p -c $(exe) $(excluded_tests) -I fake-gcc-version ; \
--- cbmc-5.84.0.orig/src/ansi-c/Makefile
+++ cbmc-5.84.0/src/ansi-c/Makefile
@@ -100,10 +100,10 @@ cprover_library$(OBJEXT): cprover_librar
 ###############################################################################
 
 library/converter$(EXEEXT): library/converter.cpp
-	$(LINKNATIVE)
+	$(LINKNATIVE) $(CXXFLAGS) $(LINKFLAGS)
 
 file_converter$(EXEEXT): file_converter.cpp
-	$(LINKNATIVE)
+	$(LINKNATIVE) $(CXXFLAGS) $(LINKFLAGS)
 
 ifeq ($(BUILD_ENV),MinGW)
   platform_unavail = library/java.io.c library/err.c library/threads.c
