X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configure;h=3f217a2eeabfd2994df5073064d057e5aed5e097;hb=eee32b5ea3226842340d5779d5f02af7951d3842;hp=1c9e5cb6c24f3530a46c01a7c4c7d3cb4eea4c53;hpb=beeda1d9c4518d0d6ef02db935720c9628b82b6e;p=gcc.git

diff --git a/configure b/configure
index 1c9e5cb6c24..3f217a2eeab 100755
--- a/configure
+++ b/configure
@@ -7163,6 +7163,7 @@ $as_echo "$enable_vtable_verify" >&6; }
 # build configuration in Makefile.
 target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
 build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'`
+bootstrap_fixincludes=no
 
 # If we are building libgomp, bootstrap it.
 if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then
@@ -7175,6 +7176,7 @@ if echo " ${target_configdirs} " | grep " libsanitizer " > /dev/null 2>&1; then
   case "$BUILD_CONFIG" in
     *bootstrap-asan* | *bootstrap-ubsan* )
       bootstrap_target_libs=${bootstrap_target_libs}target-libsanitizer,
+      bootstrap_fixincludes=yes
       ;;
   esac
 fi
@@ -7257,11 +7259,15 @@ for module in ${configdirs} ; do
       fi
     done
   fi
+  case ${module},${bootstrap_fixincludes} in
+    fixincludes,no) host_bootstrap_suffix=no-bootstrap ;;
+    *) host_bootstrap_suffix=$bootstrap_suffix ;;
+  esac
   extrasub_host="$extrasub_host
 /^@if $module\$/d
 /^@endif $module\$/d
-/^@if $module-$bootstrap_suffix\$/d
-/^@endif $module-$bootstrap_suffix\$/d"
+/^@if $module-$host_bootstrap_suffix\$/d
+/^@endif $module-$host_bootstrap_suffix\$/d"
 done
 extrasub_target=
 for module in ${target_configdirs} ; do