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

diff --git a/doc/Changelog b/doc/Changelog
index e652f3f6daf728cfd3e897a5e6c36e7b545bce32..fd10160fba1df0c1b81fe4620138852f7f0a0858 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -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.

diff --git a/makedist.sh b/makedist.sh
index df44a97a8a1f6ba1997fd38797956bead2c87e4a..d490f4aad0a72cb02a8d8cea7dd51854dc7bed77 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -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