cs configure: avoid unneecssary copies of asan and ubsan flags

This commit is contained in:
Matthew Flatt 2021-05-24 10:32:44 -06:00
parent bf768e1093
commit c7eb001be3
6 changed files with 26 additions and 14 deletions

View File

@ -1,8 +1,9 @@
if test "${enable_asan}" = "yes" ; then if test "${enable_asan}" = "yes" ; then
ASAN="-fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer -fno-common" ASAN="-fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer -fno-common"
CFLAGS="$CFLAGS $ASAN" CFLAGS="$CFLAGS $ASAN"
if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
CPPFLAGS="$CPPFLAGS $ASAN" CPPFLAGS="$CPPFLAGS $ASAN"
PREFLAGS="$PREFLAGS $ASAN" PREFLAGS="$PREFLAGS $ASAN"
fi
LDFLAGS="$LDFLAGS $ASAN" LDFLAGS="$LDFLAGS $ASAN"
fi fi

View File

@ -1,7 +1,9 @@
if test "${enable_ubsan}" = "yes" ; then if test "${enable_ubsan}" = "yes" ; then
UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero" UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero"
CFLAGS="$CFLAGS $UBSAN" CFLAGS="$CFLAGS $UBSAN"
if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
CPPFLAGS="$CPPFLAGS $UBSAN" CPPFLAGS="$CPPFLAGS $UBSAN"
PREFLAGS="$PREFLAGS $UBSAN" PREFLAGS="$PREFLAGS $UBSAN"
fi
LDFLAGS="$LDFLAGS $UBSAN" LDFLAGS="$LDFLAGS $UBSAN"
fi fi

View File

@ -3500,6 +3500,7 @@ WINDRES=windres
DLLTOOL=dlltool DLLTOOL=dlltool
PREFLAGS="$CPPFLAGS" PREFLAGS="$CPPFLAGS"
COPY_NEW_CFLAGS_TO_CPPFLAGS=yes
OWN_LIBFFI="ON" OWN_LIBFFI="ON"
@ -6971,8 +6972,10 @@ fi
if test "${enable_ubsan}" = "yes" ; then if test "${enable_ubsan}" = "yes" ; then
UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero" UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero"
CFLAGS="$CFLAGS $UBSAN" CFLAGS="$CFLAGS $UBSAN"
if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
CPPFLAGS="$CPPFLAGS $UBSAN" CPPFLAGS="$CPPFLAGS $UBSAN"
PREFLAGS="$PREFLAGS $UBSAN" PREFLAGS="$PREFLAGS $UBSAN"
fi
LDFLAGS="$LDFLAGS $UBSAN" LDFLAGS="$LDFLAGS $UBSAN"
fi fi

View File

@ -270,6 +270,7 @@ WINDRES=windres
DLLTOOL=dlltool DLLTOOL=dlltool
PREFLAGS="$CPPFLAGS" PREFLAGS="$CPPFLAGS"
COPY_NEW_CFLAGS_TO_CPPFLAGS=yes
OWN_LIBFFI="ON" OWN_LIBFFI="ON"

View File

@ -3251,6 +3251,8 @@ compress_boot_files_by_default=no
cs_auto_flags=--disable-auto-flags cs_auto_flags=--disable-auto-flags
COPY_NEW_CFLAGS_TO_CPPFLAGS=no
###### Autoconfigure ####### ###### Autoconfigure #######
if test "${enable_ios}" != "" ; then if test "${enable_ios}" != "" ; then
@ -4316,7 +4318,6 @@ if test "$ARFLAGS" = '' ; then
ARFLAGS=rc ARFLAGS=rc
fi fi
WINDRES=windres WINDRES=windres
############## platform tests ################ ############## platform tests ################
@ -4894,8 +4895,10 @@ fi
if test "${enable_ubsan}" = "yes" ; then if test "${enable_ubsan}" = "yes" ; then
UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero" UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero"
CFLAGS="$CFLAGS $UBSAN" CFLAGS="$CFLAGS $UBSAN"
if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
CPPFLAGS="$CPPFLAGS $UBSAN" CPPFLAGS="$CPPFLAGS $UBSAN"
PREFLAGS="$PREFLAGS $UBSAN" PREFLAGS="$PREFLAGS $UBSAN"
fi
LDFLAGS="$LDFLAGS $UBSAN" LDFLAGS="$LDFLAGS $UBSAN"
fi fi
@ -4905,13 +4908,14 @@ fi
if test "${enable_asan}" = "yes" ; then if test "${enable_asan}" = "yes" ; then
ASAN="-fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer -fno-common" ASAN="-fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer -fno-common"
CFLAGS="$CFLAGS $ASAN" CFLAGS="$CFLAGS $ASAN"
if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
CPPFLAGS="$CPPFLAGS $ASAN" CPPFLAGS="$CPPFLAGS $ASAN"
PREFLAGS="$PREFLAGS $ASAN" PREFLAGS="$PREFLAGS $ASAN"
fi
LDFLAGS="$LDFLAGS $ASAN" LDFLAGS="$LDFLAGS $ASAN"
fi fi
############## Makefile includes ################ ############## Makefile includes ################
if test "$INCLUDEDEP" = "#" ; then if test "$INCLUDEDEP" = "#" ; then

View File

@ -170,6 +170,8 @@ compress_boot_files_by_default=no
cs_auto_flags=--disable-auto-flags cs_auto_flags=--disable-auto-flags
COPY_NEW_CFLAGS_TO_CPPFLAGS=no
###### Autoconfigure ####### ###### Autoconfigure #######
m4_include(../ac/sdk_ios.m4) m4_include(../ac/sdk_ios.m4)
@ -199,7 +201,6 @@ if test "$ARFLAGS" = '' ; then
ARFLAGS=rc ARFLAGS=rc
fi fi
WINDRES=windres WINDRES=windres
############## platform tests ################ ############## platform tests ################