diff options
| author | Nick Clifton <nickc@redhat.com> | 2018-06-19 11:49:08 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@gcc.gnu.org> | 2018-06-19 11:49:08 +0000 |
| commit | 8006534c792ff92192ede8b3918fc6ba59553a9b (patch) | |
| tree | 08379a20040aec97e6e6bce4955dde199d461311 | |
| parent | 6b3a917093b98258a1a23dd1839be76bd4051065 (diff) | |
| download | gcc-8006534c792ff92192ede8b3918fc6ba59553a9b.zip gcc-8006534c792ff92192ede8b3918fc6ba59553a9b.tar.gz gcc-8006534c792ff92192ede8b3918fc6ba59553a9b.tar.bz2 | |
Allow building of the zlib component when the building takes place in the source directory.
* zlib/configure.ac: Restore old behaviour of only enabling
multilibs when a target subdirectory is defined. This allows
building with srcdir == builddir.
* zlib/configure: Regenerate.
From-SVN: r261739
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | zlib/configure | 8 | ||||
| -rw-r--r-- | zlib/configure.ac | 4 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2018-06-19 Nick Clifton <nickc@redhat.com> + + * zlib/configure.ac: Restore old behaviour of only enabling + multilibs when a target subdirectory is defined. This allows + building with srcdir == builddir. + * zlib/configure: Regenerate. + 2018-06-18 Eric Botcazou <ebotcazou@adacore.com> * Makefile.def (fortran): Add check-target-libgomp-fortran. diff --git a/zlib/configure b/zlib/configure index ee5527c..bed9e3ea 100755 --- a/zlib/configure +++ b/zlib/configure @@ -2182,7 +2182,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Default to --enable-multilib +if test -n "${with_target_subdir}"; then + # Default to --enable-multilib # Check whether --enable-multilib was given. if test "${enable_multilib+set}" = set; then : enableval=$enable_multilib; case "$enableval" in @@ -2219,6 +2220,7 @@ fi ac_config_commands="$ac_config_commands default-1" +fi ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -10406,7 +10408,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10409 "configure" +#line 10411 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10512,7 +10514,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10515 "configure" +#line 10517 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/zlib/configure.ac b/zlib/configure.ac index fb8d943..57d6fa5 100644 --- a/zlib/configure.ac +++ b/zlib/configure.ac @@ -4,7 +4,9 @@ AC_PREREQ(2.64) AC_INIT AC_CONFIG_SRCDIR([zlib.h]) -AM_ENABLE_MULTILIB(, ..) +if test -n "${with_target_subdir}"; then + AM_ENABLE_MULTILIB(, ..) +fi AC_CANONICAL_SYSTEM |