OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Configure zlib with --enable-host-shared for shared bfd 

When bfd is configured as a shared library, we need to configure zlib
with --enable-host-shared since zlib is used by bfd.

	PR ld/18355
	* Makefile.def: Add extra_configure_flags to host zlib.
	* configure.ac (extra_host_zlib_configure_flags): New.  Set
	to --enable-host-shared When bfd is to be built as shared
	library.  AC_SUBST.
	* Makefile.in: Regenerated.
	* configure: Likewise.
This commit is contained in:
H.J. Lu 2015-05-01 08:33:55 -07:00
parent 00923338de
commit e81d5d059b
5 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2015-05-01 H.J. Lu <hongjiu.lu@intel.com>
PR ld/18355
* Makefile.def: Add extra_configure_flags to host zlib.
* configure.ac (extra_host_zlib_configure_flags): New. Set
to --enable-host-shared When bfd is to be built as shared
library. AC_SUBST.
* Makefile.in: Regenerated.
2015-04-15 Mike Frysinger <vapier@gentoo.org>
Hans-Peter Nilsson <hp@axis.com>

4
Makefile.def
View File

@ -104,7 +104,9 @@ host_modules= { module= readline; };
host_modules= { module= sid; };
host_modules= { module= sim; };
host_modules= { module= texinfo; no_install= true; };
host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; };
host_modules= { module= zlib; no_install=true; no_check=true;
bootstrap=true;
extra_configure_flags='@extra_host_zlib_configure_flags@';};
host_modules= { module= gdb; };
host_modules= { module= expect; };
host_modules= { module= guile; };

20
Makefile.in
View File

@ -26714,7 +26714,7 @@ configure-zlib:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--target=${target_alias} @extra_host_zlib_configure_flags@ \
|| exit 1
@endif zlib
@ -26749,7 +26749,8 @@ configure-stage1-zlib:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
\
$(STAGE1_CONFIGURE_FLAGS)
$(STAGE1_CONFIGURE_FLAGS) \
@extra_host_zlib_configure_flags@
@endif zlib-bootstrap
.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
@ -26782,7 +26783,8 @@ configure-stage2-zlib:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE2_CONFIGURE_FLAGS)
$(STAGE2_CONFIGURE_FLAGS) \
@extra_host_zlib_configure_flags@
@endif zlib-bootstrap
.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
@ -26815,7 +26817,8 @@ configure-stage3-zlib:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE3_CONFIGURE_FLAGS)
$(STAGE3_CONFIGURE_FLAGS) \
@extra_host_zlib_configure_flags@
@endif zlib-bootstrap
.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
@ -26848,7 +26851,8 @@ configure-stage4-zlib:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGE4_CONFIGURE_FLAGS)
$(STAGE4_CONFIGURE_FLAGS) \
@extra_host_zlib_configure_flags@
@endif zlib-bootstrap
.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
@ -26881,7 +26885,8 @@ configure-stageprofile-zlib:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEprofile_CONFIGURE_FLAGS)
$(STAGEprofile_CONFIGURE_FLAGS) \
@extra_host_zlib_configure_flags@
@endif zlib-bootstrap
.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
@ -26914,7 +26919,8 @@ configure-stagefeedback-zlib:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
$(STAGEfeedback_CONFIGURE_FLAGS)
$(STAGEfeedback_CONFIGURE_FLAGS) \
@extra_host_zlib_configure_flags@
@endif zlib-bootstrap

10
configure vendored
View File

@ -643,6 +643,7 @@ CXXFLAGS_FOR_TARGET
CFLAGS_FOR_TARGET
DEBUG_PREFIX_CFLAGS_FOR_TARGET
SYSROOT_CFLAGS_FOR_TARGET
extra_host_zlib_configure_flags
extra_host_libiberty_configure_flags
stage1_languages
extra_linker_plugin_flags
@ -6585,15 +6586,24 @@ fi
# Sometimes we have special requirements for the host libiberty.
extra_host_libiberty_configure_flags=
extra_host_zlib_configure_flags=
case " $configdirs " in
*" lto-plugin "* | *" libcc1 "*)
# When these are to be built as shared libraries, the same applies to
# libiberty.
extra_host_libiberty_configure_flags=--enable-shared
;;
*" bfd "*)
# When bfd is to be built as a shared library, the same applies to
# zlib.
if test "$enable_shared" = "yes"; then
extra_host_zlib_configure_flags=--enable-host-shared
fi
;;
esac
# Produce a warning message for the subdirs we can't configure.
# This isn't especially interesting in the Cygnus tree, but in the individual
# FSF releases, it's important to let people know when their machine isn't

9
configure.ac
View File

@ -2276,14 +2276,23 @@ fi
# Sometimes we have special requirements for the host libiberty.
extra_host_libiberty_configure_flags=
extra_host_zlib_configure_flags=
case " $configdirs " in
*" lto-plugin "* | *" libcc1 "*)
# When these are to be built as shared libraries, the same applies to
# libiberty.
extra_host_libiberty_configure_flags=--enable-shared
;;
*" bfd "*)
# When bfd is to be built as a shared library, the same applies to
# zlib.
if test "$enable_shared" = "yes"; then
extra_host_zlib_configure_flags=--enable-host-shared
fi
;;
esac
AC_SUBST(extra_host_libiberty_configure_flags)
AC_SUBST(extra_host_zlib_configure_flags)
# Produce a warning message for the subdirs we can't configure.
# This isn't especially interesting in the Cygnus tree, but in the individual