diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-12-21 12:28:40 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-12-21 12:28:40 +0100 |
| commit | c21fdaa1a7c7487015123c67b0cfde3497e2bdb9 (patch) | |
| tree | 83fafe333e359a5a8e02482446c252b8e1ddd1f0 | |
| parent | db313371c7e83f11b5a8ef4b3ac281b036e56c47 (diff) | |
| download | gcc-c21fdaa1a7c7487015123c67b0cfde3497e2bdb9.zip gcc-c21fdaa1a7c7487015123c67b0cfde3497e2bdb9.tar.gz gcc-c21fdaa1a7c7487015123c67b0cfde3497e2bdb9.tar.bz2 | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.ac | 9 |
3 files changed, 20 insertions, 4 deletions
@@ -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. @@ -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 51ee705..0d6efcf 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. |