diff --git a/racket/src/ac/asan.m4 b/racket/src/ac/asan.m4
index d279e6ade6..925d961a8f 100644
--- a/racket/src/ac/asan.m4
+++ b/racket/src/ac/asan.m4
@@ -1,8 +1,9 @@
 if test "${enable_asan}" = "yes" ; then
    ASAN="-fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer -fno-common"
    CFLAGS="$CFLAGS $ASAN"
-   CPPFLAGS="$CPPFLAGS $ASAN"
-   PREFLAGS="$PREFLAGS $ASAN"
+   if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
+     CPPFLAGS="$CPPFLAGS $ASAN"
+     PREFLAGS="$PREFLAGS $ASAN"
+   fi
    LDFLAGS="$LDFLAGS $ASAN"
 fi
-
diff --git a/racket/src/ac/ubsan.m4 b/racket/src/ac/ubsan.m4
index 715de38f67..f81028b965 100644
--- a/racket/src/ac/ubsan.m4
+++ b/racket/src/ac/ubsan.m4
@@ -1,7 +1,9 @@
 if test "${enable_ubsan}" = "yes" ; then
    UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero"
    CFLAGS="$CFLAGS $UBSAN"
-   CPPFLAGS="$CPPFLAGS $UBSAN"
-   PREFLAGS="$PREFLAGS $UBSAN"
+   if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
+     CPPFLAGS="$CPPFLAGS $UBSAN"
+     PREFLAGS="$PREFLAGS $UBSAN"
+   fi
    LDFLAGS="$LDFLAGS $UBSAN"
 fi
diff --git a/racket/src/bc/configure b/racket/src/bc/configure
index 77015309a9..0464325049 100755
--- a/racket/src/bc/configure
+++ b/racket/src/bc/configure
@@ -3500,6 +3500,7 @@ WINDRES=windres
 DLLTOOL=dlltool
 
 PREFLAGS="$CPPFLAGS"
+COPY_NEW_CFLAGS_TO_CPPFLAGS=yes
 
 OWN_LIBFFI="ON"
 
@@ -6971,8 +6972,10 @@ fi
 if test "${enable_ubsan}" = "yes" ; then
    UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero"
    CFLAGS="$CFLAGS $UBSAN"
-   CPPFLAGS="$CPPFLAGS $UBSAN"
-   PREFLAGS="$PREFLAGS $UBSAN"
+   if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
+     CPPFLAGS="$CPPFLAGS $UBSAN"
+     PREFLAGS="$PREFLAGS $UBSAN"
+   fi
    LDFLAGS="$LDFLAGS $UBSAN"
 fi
 
diff --git a/racket/src/bc/configure.ac b/racket/src/bc/configure.ac
index c4398c89e3..097a020a14 100644
--- a/racket/src/bc/configure.ac
+++ b/racket/src/bc/configure.ac
@@ -270,6 +270,7 @@ WINDRES=windres
 DLLTOOL=dlltool
 
 PREFLAGS="$CPPFLAGS"
+COPY_NEW_CFLAGS_TO_CPPFLAGS=yes
 
 OWN_LIBFFI="ON"
 
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 890b493cc5..f303717fcc 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -3251,6 +3251,8 @@ compress_boot_files_by_default=no
 
 cs_auto_flags=--disable-auto-flags
 
+COPY_NEW_CFLAGS_TO_CPPFLAGS=no
+
 ###### Autoconfigure #######
 
 if test "${enable_ios}" != "" ; then
@@ -4316,7 +4318,6 @@ if test "$ARFLAGS" = '' ; then
   ARFLAGS=rc
 fi
 
-
 WINDRES=windres
 
 ############## platform tests ################
@@ -4894,8 +4895,10 @@ fi
 if test "${enable_ubsan}" = "yes" ; then
    UBSAN="-fsanitize=undefined -fno-sanitize=alignment -fno-sanitize=float-divide-by-zero"
    CFLAGS="$CFLAGS $UBSAN"
-   CPPFLAGS="$CPPFLAGS $UBSAN"
-   PREFLAGS="$PREFLAGS $UBSAN"
+   if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
+     CPPFLAGS="$CPPFLAGS $UBSAN"
+     PREFLAGS="$PREFLAGS $UBSAN"
+   fi
    LDFLAGS="$LDFLAGS $UBSAN"
 fi
 
@@ -4905,13 +4908,14 @@ fi
 if test "${enable_asan}" = "yes" ; then
    ASAN="-fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer -fno-common"
    CFLAGS="$CFLAGS $ASAN"
-   CPPFLAGS="$CPPFLAGS $ASAN"
-   PREFLAGS="$PREFLAGS $ASAN"
+   if test "${COPY_NEW_CFLAGS_TO_CPPFLAGS}" = "yes" ; then
+     CPPFLAGS="$CPPFLAGS $ASAN"
+     PREFLAGS="$PREFLAGS $ASAN"
+   fi
    LDFLAGS="$LDFLAGS $ASAN"
 fi
 
 
-
 ############## Makefile includes ################
 
 if test "$INCLUDEDEP" = "#" ; then
diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac
index bac14c5fbc..89b060e812 100644
--- a/racket/src/cs/c/configure.ac
+++ b/racket/src/cs/c/configure.ac
@@ -170,6 +170,8 @@ compress_boot_files_by_default=no
 
 cs_auto_flags=--disable-auto-flags
 
+COPY_NEW_CFLAGS_TO_CPPFLAGS=no
+
 ###### Autoconfigure #######
 
 m4_include(../ac/sdk_ios.m4)
@@ -199,7 +201,6 @@ if test "$ARFLAGS" = '' ; then
   ARFLAGS=rc
 fi
 
-
 WINDRES=windres
 
 ############## platform tests ################