configure: do not pass AM_TESTS_ENVIRONMENT directly

This commit is contained in:
Evgeny Grin (Karlson2k)
2022-10-30 13:20:19 +03:00
parent 0458e0d2a3
commit 9440f9aefe
7 changed files with 15 additions and 3 deletions
+3 -3
View File
@@ -3616,7 +3616,7 @@ AS_VAR_IF([[enable_asserts]], [["yes"]],
) )
AS_UNSET([enabled_sanitizers]) AS_UNSET([enabled_sanitizers])
AM_TESTS_ENVIRONMENT="" TESTS_ENVIRONMENT_ac=""
AM_ASAN_OPTIONS="" AM_ASAN_OPTIONS=""
AM_UBSAN_OPTIONS="" AM_UBSAN_OPTIONS=""
AM_LSAN_OPTIONS="" AM_LSAN_OPTIONS=""
@@ -4105,7 +4105,7 @@ int main(void)
AS_VAR_IF([enable_san_leak], ["yes"], AS_VAR_IF([enable_san_leak], ["yes"],
[AM_LSAN_OPTIONS="use_unaligned=1"] [AM_LSAN_OPTIONS="use_unaligned=1"]
) )
AM_TESTS_ENVIRONMENT='\ TESTS_ENVIRONMENT_ac='\
ASAN_OPTIONS="$(AM_ASAN_OPTIONS)" ; export ASAN_OPTIONS ; \ ASAN_OPTIONS="$(AM_ASAN_OPTIONS)" ; export ASAN_OPTIONS ; \
UBSAN_OPTIONS="$(AM_UBSAN_OPTIONS)" ; export UBSAN_OPTIONS ; \ UBSAN_OPTIONS="$(AM_UBSAN_OPTIONS)" ; export UBSAN_OPTIONS ; \
LSAN_OPTIONS="$(AM_LSAN_OPTIONS)" ; export LSAN_OPTIONS ;' LSAN_OPTIONS="$(AM_LSAN_OPTIONS)" ; export LSAN_OPTIONS ;'
@@ -4132,7 +4132,7 @@ AM_CONDITIONAL([USE_SANITIZERS],
AC_SUBST([AM_ASAN_OPTIONS]) AC_SUBST([AM_ASAN_OPTIONS])
AC_SUBST([AM_UBSAN_OPTIONS]) AC_SUBST([AM_UBSAN_OPTIONS])
AC_SUBST([AM_LSAN_OPTIONS]) AC_SUBST([AM_LSAN_OPTIONS])
AC_SUBST([AM_TESTS_ENVIRONMENT]) AC_SUBST([TESTS_ENVIRONMENT_ac])
MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS" MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS"
+2
View File
@@ -9,6 +9,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
AM_LDFLAGS = $(LDFLAGS_ac) AM_LDFLAGS = $(LDFLAGS_ac)
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
if USE_COVERAGE if USE_COVERAGE
AM_CFLAGS += --coverage AM_CFLAGS += --coverage
endif endif
+2
View File
@@ -12,6 +12,8 @@ AM_LDFLAGS = $(LDFLAGS_ac)
MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT) MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT)
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
if USE_COVERAGE if USE_COVERAGE
AM_CFLAGS += --coverage AM_CFLAGS += --coverage
endif endif
+2
View File
@@ -8,6 +8,8 @@ AM_CFLAGS = $(CFLAGS_ac) $(HIDDEN_VISIBILITY_CFLAGS)
AM_LDFLAGS = $(LDFLAGS_ac) AM_LDFLAGS = $(LDFLAGS_ac)
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libmicrohttpd.la libmicrohttpd.la
+2
View File
@@ -15,6 +15,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
AM_LDFLAGS = $(LDFLAGS_ac) AM_LDFLAGS = $(LDFLAGS_ac)
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
if USE_COVERAGE if USE_COVERAGE
AM_CFLAGS += -fprofile-arcs -ftest-coverage AM_CFLAGS += -fprofile-arcs -ftest-coverage
endif endif
+2
View File
@@ -16,6 +16,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
AM_LDFLAGS = $(LDFLAGS_ac) AM_LDFLAGS = $(LDFLAGS_ac)
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
if USE_COVERAGE if USE_COVERAGE
AM_CFLAGS += --coverage AM_CFLAGS += --coverage
endif endif
+2
View File
@@ -10,6 +10,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
AM_LDFLAGS = $(LDFLAGS_ac) AM_LDFLAGS = $(LDFLAGS_ac)
AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
if USE_COVERAGE if USE_COVERAGE
AM_CFLAGS += -fprofile-arcs -ftest-coverage AM_CFLAGS += -fprofile-arcs -ftest-coverage
endif endif