[PATCH] Don't bootstrap libmpx unless needed

[Jakub Jelinek]

Hi!

Similarly how we deal with bootstrapping libsanitizer only when
doing bootstrap-{a,u}san bootstrap, this avoids bootstrapping libmpx
if we don't need it for bootstrapping.

Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

2016-12-20  Jakub Jelinek  <ja...@redhat.com>

        * configure.ac: Don't bootstrap libmpx unless --with-build-config
        includes bootstrap-mpx.
        * configure: Regenerated.

--- configure.ac.jj1    2016-12-01 23:24:53.000000000 +0100
+++ configure.ac        2016-12-20 10:50:08.715213438 +0100
@@ -2643,9 +2643,14 @@ if echo " ${target_configdirs} " | grep
   bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
 fi
 
-# If we are building libmpx, bootstrap it.
+# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
+# bootstrap it.
 if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+  case "$BUILD_CONFIG" in
+    *bootstrap-mpx* )
+      bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+      ;;
+  esac
 fi
 
 # Determine whether gdb needs tk/tcl or not.
--- configure.jj1       2016-12-02 00:15:10.000000000 +0100
+++ configure   2016-12-20 10:50:22.503034682 +0100
@@ -7057,9 +7057,14 @@ if echo " ${target_configdirs} " | grep
   bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
 fi
 
-# If we are building libmpx, bootstrap it.
+# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
+# bootstrap it.
 if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+  case "$BUILD_CONFIG" in
+    *bootstrap-mpx* )
+      bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+      ;;
+  esac
 fi
 
 # Determine whether gdb needs tk/tcl or not.

        Jakub