From c21fdaa1a7c7487015123c67b0cfde3497e2bdb9 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 21 Dec 2016 12:28:40 +0100
Subject: [PATCH] configure.ac: Don't bootstrap libmpx unless
--with-build-config includes bootstrap-mpx.
* configure.ac: Don't bootstrap libmpx unless --with-build-config
includes bootstrap-mpx.
* configure: Regenerated.
From-SVN: r243849
---
ChangeLog | 6 ++++++
configure | 9 +++++++--
configure.ac | 9 +++++++--
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c97158a96993..2e35b0104aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-21 Jakub Jelinek <jakub@redhat.com>
+
+ * configure.ac: Don't bootstrap libmpx unless --with-build-config
+ includes bootstrap-mpx.
+ * configure: Regenerated.
+
2016-12-19 Chenghua Xu <paul.hua.gm@gmail.com>
* MAINTAINERS (Write After Approval): Add myself.
diff --git a/configure b/configure
index b6389e4718d7..b8d60964a947 100755
--- a/configure
+++ b/configure
@@ -7057,9 +7057,14 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
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.
diff --git a/configure.ac b/configure.ac
index 51ee70507cfc..0d6efcfe3a28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2643,9 +2643,14 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
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.
--
GitLab