upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-17 20:22:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix stack-protector change to not override other CFLAGS options.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2021-03-31 10:01:42 +02:00
parent 1d54b2cdef
commit d23e1f1100
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
31 March 2021: Wouter
- Fix stack-protector change to not override other CFLAGS options.
30 March 2021: George
- Disable the use of stack-protector for cross compiled 32-bit windows
builds; relates to #444.

12
makedist.sh
View file

@ -364,16 +364,16 @@ if [ "$DOWIN" = "yes" ]; then
fi
echo "$configure"' --enable-debug --enable-static-exe --disable-flto '"$* $cross_flag "$file_flag" "$file2_flag" "$file3_flag""
if test "$W64" = "no"; then
$configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" \
# Disable stack-protector for 32-bit windows builds.
$configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
|| error_cleanup "Could not configure"
else
$configure --enable-debug --enable-static-exe --disable-flto $* $cross_flag \
|| error_cleanup "Could not configure"
fi
info "Calling make"
# Disable stack-protector for 32-bit windows builds.
if test "$W64" = "no"; then
make $MINJ CFLAGS='-fno-stack-protector' || error_cleanup "Could not make"
make $MINJ || error_cleanup "Could not make"
else
make $MINJ || error_cleanup "Could not make"
fi
@ -384,16 +384,16 @@ if [ "$DOWIN" = "yes" ]; then
cd ../unbound_shared
echo "$configure"' --enable-debug --disable-flto '"$* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag""
if test "$W64" = "no"; then
$configure --enable-debug --disable-flto $* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag" \
# Disable stack-protector for 32-bit windows builds.
$configure --enable-debug --disable-flto $* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
|| error_cleanup "Could not configure"
else
$configure --enable-debug --disable-flto $* $shared_cross_flag \
|| error_cleanup "Could not configure"
fi
info "Calling make for DLL"
# Disable stack-protector for 32-bit windows builds.
if test "$W64" = "no"; then
make $MINJ CFLAGS='-fno-stack-protector' || error_cleanup "Could not make DLL"
make $MINJ || error_cleanup "Could not make DLL"
else
make $MINJ || error_cleanup "Could not make DLL"
fi