This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: [patch] binutils current: libiberty/configure and --with-build-subdir
On Tue, Feb 05, 2002 at 11:29:42AM -0500, DJ Delorie wrote:
>
> These changes seem wrong to me. The point of them is to avoid trying
> to auto-detect certain things because we're building a target library,
> but for the build libiberty we are guaranteed to have a working
> toolchain and we can safely autodetect everything.
>
How about this patch? We just need to get the right "libiberty_topdir".
We don't need to guess the build machine name since it is passed to
libiberty. The only thing missing is the toplevel "config" directory
which may be needed by libiberty. I have a kludge for that also.
H.J.
----
2002-02-05 H.J. Lu (hjl@gnu.org)
* config-ml.in (ml_srcdotdot): Support --with-build-subdir.
(ml_unsubdir): Likewise.
2002-02-05 H.J. Lu (hjl@gnu.org)
* configure.in: Support --with-build-subdir.
* configure: Rebuild.
--- binutils-2.11.93.0.1/config-ml.in.build Tue Aug 22 16:49:39 2000
+++ binutils-2.11.93.0.1/config-ml.in Tue Feb 5 00:14:06 2002
@@ -580,7 +580,7 @@ if [ "${ml_verbose}" = --verbose ]; then
fi
if [ "${srcdir}" = "." ]; then
- if [ "${with_target_subdir}" != "." ]; then
+ if [ "${with_build_subdir}" != "." ] || [ "${with_target_subdir}" != "." ]; then
ml_srcdotdot="../"
else
ml_srcdotdot=""
--- binutils-2.11.93.0.1/libiberty/configure.in.build Mon Feb 4 23:11:56 2002
+++ binutils-2.11.93.0.1/libiberty/configure.in Tue Feb 5 00:13:36 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
@@ -406,7 +411,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
@@ -415,6 +420,7 @@ fi],
srcdir=${srcdir}
host=${host}
target=${target}
+with_build_subdir=${with_build_subdir}
with_target_subdir=${with_target_subdir}
with_multisubdir=${with_multisubdir}
ac_configure_args="--enable-multilib ${ac_configure_args}"