mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 19:03:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow building of the zlib component when the building takes place in the source directory.

Browse Source 
* 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
This commit is contained in:
Nick Clifton 2018-06-19 11:49:08 +00:00 committed by Nick Clifton
parent 6b3a917093
commit 8006534c79
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

8
zlib/configure vendored
View File

@ -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

4
zlib/configure.ac
View File

@ -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