diff options
| author | nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-06-19 11:49:08 +0000 |
|---|---|---|
| committer | nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-06-19 11:49:08 +0000 |
| commit | 9805e646ffceaf56fa008ca337b5e3261d330a4e (patch) | |
| tree | 08379a20040aec97e6e6bce4955dde199d461311 /zlib | |
| parent | f16208f941ca85e10f794ac003514e922c68dfd6 (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261739 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib')
| -rwxr-xr-x | zlib/configure | 8 | ||||
| -rw-r--r-- | zlib/configure.ac | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/zlib/configure b/zlib/configure index ee5527c4a40..bed9e3ea2bf 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 fb8d943905e..57d6fa56b69 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 |