This is the mail archive of the
gdb@sources.redhat.com
mailing list for the GDB project.
Re: The canadian cross build is broken
On Tue, Mar 26, 2002 at 05:00:27PM -0500, DJ Delorie wrote:
>
> > Why? Here is the fragment. $frag won't be empty. The default one is
> > mh-${host_cpu}pic:
>
> In some future cases, it may end up getting added twice, in other
> cases, it's empty and may cause problems. For example, for cygwin
> frag remains set to its previous value (currently empty) so you end up
> adding "config/" to the list of frags.
A new patch. I put back
+with_build_subdir=${with_build_subdir}
into configure.in. Otherwise, ${libiberty_topdir}/config-ml.in won't
be called.
H.J.
---
2002-03-26 H.J. Lu (hjl@gnu.org)
* config.table: Support --with-build-subdir.
* configure.in: Likewise.
* configure: Rebuild.
--- binutils-2.12.90.0.3/libiberty/config.table.build Fri Nov 16 14:05:55 2001
+++ binutils-2.12.90.0.3/libiberty/config.table Tue Mar 26 14:02:46 2002
@@ -1,3 +1,9 @@
+# Don't build the shared library for build.
+if [ -n "${with_build_subdir}" ]; then
+ enable_shared=no
+fi
+
+frag=
case "${host}" in
rs6000-ibm-aix3.1 | rs6000-ibm-aix)
frag=mh-aix ;;
@@ -8,7 +14,11 @@ case "${host}" in
i[345]86-*-windows*) frag=mh-windows ;;
esac
-frags=$frag
+if [ -n "${frag}" ]; then
+ frags=${libiberty_topdir}/libiberty/config/$frag
+else
+ frags=
+fi
# If they didn't specify --enable-shared, don't generate shared libs.
case "${enable_shared}" in
@@ -18,32 +28,27 @@ case "${enable_shared}" in
*) shared=yes ;;
esac
if [ "${shared}" = "yes" ]; then
+ frag=
case "${host}" in
*-*-cygwin*) ;;
- alpha*-*-linux*) frags="${frags} ../../config/mh-elfalphapic" ;;
- arm*-*-*) frags="${frags} ../../config/mh-armpic" ;;
- hppa*-*-*) frags="${frags} ../../config/mh-papic" ;;
- i[3456]86-*-*) frags="${frags} ../../config/mh-x86pic" ;;
- mips*-*-linux*) frags="${frags} ../../config/mh-mipspic" ;;
+ alpha*-*-linux*) frag=mh-elfalphapic ;;
+ arm*-*-*) frag=mh-armpic ;;
+ hppa*-*-*) frag=mh-papic ;;
+ i[3456]86-*-*) frag=mh-x86pic ;;
+ mips*-*-linux*) frag=mh-mipspic ;;
powerpc*-*-aix*) ;;
- powerpc*-*-*) frags="${frags} ../../config/mh-ppcpic" ;;
- sparc*-*-*) frags="${frags} ../../config/mh-sparcpic" ;;
- *-*-*) frags="${frags} ../../config/mh-${host_cpu}pic" ;;
+ powerpc*-*-*) frag=mh-ppcpic ;;
+ sparc*-*-*) frag=mh-sparcpic ;;
+ *) frag=mh-${host_cpu}pic ;;
esac
+ if [ -n "${frag}" ]; then
+ frags="${frags} ${libiberty_topdir}/config/${frag}"
+ fi
fi
echo "# Warning: this fragment is automatically generated" > temp-frag
for frag in ${frags}; do
- case ${frag} in
- ../* )
- if [ ${srcdir} = . ]; then
- [ -n "${with_target_subdir}" ] && frag=../${frag}
- [ -n "${with_multisrctop}" ] && frag=${with_multisrctop}${frag}
- fi
- ;;
- esac
- frag=${srcdir}/${xsrcdir}config/$frag
if [ -f ${frag} ]; then
echo "Appending ${frag} to xhost-mkfrag"
echo "# Following fragment copied from ${frag}" >> temp-frag
--- binutils-2.12.90.0.3/libiberty/configure.in.build Thu Mar 7 11:52:40 2002
+++ binutils-2.12.90.0.3/libiberty/configure.in Tue Mar 26 14:32:11 2002
@@ -5,14 +5,19 @@ AC_INIT(pexecute.c)
dnl We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
-[ --with-target-subdir=SUBDIR Configuring in a subdirectory])
+[ --with-target-subdir=SUBDIR Configuring in a subdirectory for target])
+AC_ARG_WITH(build-subdir,
+[ --with-build-subdir=SUBDIR Configuring in a subdirectory for build])
AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST Configuring with a cross compiler])
AC_ARG_WITH(newlib,
[ --with-newlib Configuring with newlib])
if test "${srcdir}" = "."; then
- if test -z "${with_target_subdir}"; then
+ if test -n "${with_build_subdir}"; then
+ libiberty_topdir="${srcdir}/../.."
+ with_target_subdir=
+ elif test -z "${with_target_subdir}"; then
libiberty_topdir="${srcdir}/.."
else
if test "${with_target_subdir}" != "."; then
@@ -429,7 +434,7 @@ AC_SUBST(INSTALL_DEST)
AC_OUTPUT(Makefile testsuite/Makefile,
[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
if test -n "$CONFIG_FILES"; then
- if test -n "${with_target_subdir}"; then
+ if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
# FIXME: We shouldn't need to set ac_file
ac_file=Makefile
. ${libiberty_topdir}/config-ml.in
@@ -439,6 +444,7 @@ srcdir=${srcdir}
host=${host}
target=${target}
with_target_subdir=${with_target_subdir}
+with_build_subdir=${with_build_subdir}
with_multisubdir=${with_multisubdir}
ac_configure_args="--enable-multilib ${ac_configure_args}"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}