diff options
| author | June McEnroe <june@causal.agency> | 2026-06-01 14:51:38 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2026-06-01 14:51:38 -0400 |
| commit | 3f37a96f031fe63a14417d659c8fdc5e51d691e6 (patch) | |
| tree | e8fbf5aa3319591a90b0e43f4fd6321228d49ff4 | |
| parent | Import LibreSSL 4.3.1 (diff) | |
| download | libretls-3f37a96f031fe63a14417d659c8fdc5e51d691e6.tar.gz libretls-3f37a96f031fe63a14417d659c8fdc5e51d691e6.zip | |
Import LibreSSL 4.3.2 upstream
Diffstat (limited to '')
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/check-hardening-options.m4 | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/VERSION b/VERSION index f77856a..cc2fbe8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.3.1 +4.3.2 diff --git a/configure.ac b/configure.ac index eb2b9ce..c0ad033 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # This must be saved before AC_PROG_CC USER_CFLAGS="$CFLAGS" +USER_LDFLAGS="$LDFLAGS" AC_PROG_CC([cc gcc]) AM_PROG_CC_C_O diff --git a/m4/check-hardening-options.m4 b/m4/check-hardening-options.m4 index 2cb3083..401b7e4 100644 --- a/m4/check-hardening-options.m4 +++ b/m4/check-hardening-options.m4 @@ -3,7 +3,7 @@ AC_DEFUN([CHECK_CFLAG], [ AC_LANG_ASSERT(C) AC_MSG_CHECKING([if $saved_CC supports "$1"]) old_cflags="$CFLAGS" - CFLAGS="$1 -Wall -Werror" + CFLAGS="$USER_CFLAGS $1 -Wall -Werror" AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])], [AC_MSG_RESULT([yes]) CFLAGS=$old_cflags @@ -17,7 +17,7 @@ AC_DEFUN([CHECK_LDFLAG], [ AC_LANG_ASSERT(C) AC_MSG_CHECKING([if $saved_LD supports "$1"]) old_ldflags="$LDFLAGS" - LDFLAGS="$1 -Wall -Werror" + LDFLAGS="$USER_LDFLAGS $1 -Wall -Werror" AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])], [AC_MSG_RESULT([yes]) LDFLAGS=$old_ldflags |