I can't quite tell, but I have a nagging suspicion that this is unused.
It would be nice to simplify some of the multilib stuff, and the
complexity around source directory (rather than build directory)
handling seems like it ought not to be so necessary.
This also nicely fixes a "fixme" about the configure and makefile
corresponding variable being out of sync. Now there is no pair to get
out of sync.
I admit this is not tested...because I don't know how to test those
branches. (Indeed, they theory that this variable is dead is tantamount
to saying it can't be tested --- the test is doing every extant possible
configuration and seeing that in none of them does the variable matter.)
ChangeLog:
* config-ml.in: Remove `with_multisrctop` / `--with-multisrctop`.
* libgo/configure: Regenerate.
config/ChangeLog:
* multi.m4: Remove `with_multisrctop`.
libada/ChangeLog:
* configure: Regenerate.
libatomic/ChangeLog:
* configure: Regenerate.
libbacktrace/ChangeLog:
* configure: Regenerate.
libffi/ChangeLog:
* configure: Regenerate.
libgcc/ChangeLog:
* configure: Regenerate.
* configure.ac: Remove `with_multisrctop`.
libgcobol/ChangeLog:
* configure: Regenerate.
libgfortran/ChangeLog:
* configure: Regenerate.
libgm2/ChangeLog:
* configure: Regenerate.
libgomp/ChangeLog:
* configure: Regenerate.
libgrust/ChangeLog:
* configure: Regenerate.
libiberty/ChangeLog:
* configure: Regenerate.
* configure.ac: Remove `with_multisrctop`.
libitm/ChangeLog:
* configure: Regenerate.
libobjc/ChangeLog:
* configure: Regenerate.
libphobos/ChangeLog:
* configure: Regenerate.
libquadmath/ChangeLog:
* configure: Regenerate.
libsanitizer/ChangeLog:
* configure: Regenerate.
libssp/ChangeLog:
* configure: Regenerate.
libstdc++-v3/ChangeLog:
* configure: Regenerate.
libvtv/ChangeLog:
* configure: Regenerate.
zlib/ChangeLog:
* configure: Regenerate.
---
config-ml.in | 12 +++---------
config/multi.m4 | 7 +++----
libada/configure | 7 +++----
libatomic/configure | 7 +++----
libbacktrace/configure | 7 +++----
libffi/configure | 7 +++----
libgcc/configure | 4 ++--
libgcc/configure.ac | 4 ++--
libgcobol/configure | 7 +++----
libgfortran/configure | 7 +++----
libgm2/configure | 7 +++----
libgo/configure | 7 +++----
libgomp/configure | 7 +++----
libgrust/configure | 7 +++----
libiberty/configure | 4 ++--
libiberty/configure.ac | 4 ++--
libitm/configure | 7 +++----
libobjc/configure | 7 +++----
libphobos/configure | 7 +++----
libquadmath/configure | 7 +++----
libsanitizer/configure | 7 +++----
libssp/configure | 7 +++----
libstdc++-v3/configure | 7 +++----
libvtv/configure | 7 +++----
zlib/configure | 7 +++----
25 files changed, 71 insertions(+), 97 deletions(-)
diff --git a/config-ml.in b/config-ml.in
index 7934a1ddf4b..b0b35d502fa 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -35,9 +35,9 @@
#
# if [ "${srcdir}" = "." ] ; then
# if [ "${with_target_subdir}" != "." ] ; then
-# . ${with_multisrctop}../../config-ml.in
+# . ${srcdir}/../../config-ml.in
# else
-# . ${with_multisrctop}../config-ml.in
+# . ${srcdir}/../config-ml.in
# fi
# else
# . ${srcdir}/../config-ml.in
@@ -72,14 +72,10 @@
# Configure variables:
# ${with_target_subdir} = "." for native, or ${target_alias} for cross.
# Set by top level Makefile.
-# ${with_multisrctop} = how many levels of multilibs there are in the source
-# tree. It exists to handle the case of configuring in the source tree:
-# ${srcdir} is not constant.
# ${with_multisubdir} = name of multilib subdirectory (eg: m68020/m68881).
#
# Makefile variables:
# MULTISRCTOP = number of multilib levels in source tree (+1 if cross)
-# (FIXME: note that this is different than ${with_multisrctop}. Check out.).
# MULTIBUILDTOP = number of multilib levels in build tree
# MULTIDIRS = list of multilib subdirs (eg: m68000 m68020 ...)
# (only defined in each library's main Makefile).
@@ -722,7 +718,6 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
fi
ml_newsrcdir="."
ml_srcdiroption=
- multisrctop=${dotdot}
;;
*)
case "${srcdir}" in
@@ -734,7 +729,6 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
;;
esac
ml_srcdiroption="-srcdir=${ml_newsrcdir}"
- multisrctop=
;;
esac
@@ -893,7 +887,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
fi
if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
- --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
+ --with-multisubdir=${ml_dir} \
"${ac_configure_args}" ${ml_config_env} ${ml_srcdiroption} ; then
true
else
diff --git a/config/multi.m4 b/config/multi.m4
index 10680a5b32b..1c7f3b6e5c7 100644
--- a/config/multi.m4
+++ b/config/multi.m4
@@ -23,14 +23,14 @@ AC_ARG_ENABLE(multilib,
[multilib=yes])
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../$2"
+ multi_basedir="$srcdir/../$2"
else
- multi_basedir="$srcdir/$with_multisrctop$2"
+ multi_basedir="$srcdir/$2"
fi
else
multi_basedir="$srcdir/$2"
@@ -57,7 +57,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libada/configure b/libada/configure
index ac4dad3ad3b..d02527969a9 100755
--- a/libada/configure
+++ b/libada/configure
@@ -2283,14 +2283,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -4497,7 +4497,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libatomic/configure b/libatomic/configure
index 67b3a6388d7..656c0e92d4d 100755
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -3334,14 +3334,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -16627,7 +16627,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 85be043009a..de2c3c6ea8f 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -2575,14 +2575,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -15304,7 +15304,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libffi/configure b/libffi/configure
index f82a45b13bc..d8d0911f5e7 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -2672,14 +2672,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -17899,7 +17899,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libgcc/configure b/libgcc/configure
index 18418336c9b..02d8aff481a 100755
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -2190,9 +2190,9 @@ if test "${srcdir}" = "."; then
libgcc_topdir="${srcdir}/.."
else
if test "${with_target_subdir}" != "."; then
- libgcc_topdir="${srcdir}/${with_multisrctop}../.."
+ libgcc_topdir="${srcdir}/../.."
else
- libgcc_topdir="${srcdir}/${with_multisrctop}.."
+ libgcc_topdir="${srcdir}/.."
fi
fi
else
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index 85e4f1bc48b..cfb626aedbc 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -37,9 +37,9 @@ if test "${srcdir}" = "."; then
libgcc_topdir="${srcdir}/.."
else
if test "${with_target_subdir}" != "."; then
- libgcc_topdir="${srcdir}/${with_multisrctop}../.."
+ libgcc_topdir="${srcdir}/../.."
else
- libgcc_topdir="${srcdir}/${with_multisrctop}.."
+ libgcc_topdir="${srcdir}/.."
fi
fi
else
diff --git a/libgcobol/configure b/libgcobol/configure
index 72715177c23..9a60ce926c4 100755
--- a/libgcobol/configure
+++ b/libgcobol/configure
@@ -3103,14 +3103,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -18420,7 +18420,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libgfortran/configure b/libgfortran/configure
index 9898a94a372..472509c087f 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -3595,14 +3595,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -32318,7 +32318,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libgm2/configure b/libgm2/configure
index 8ffdb311625..c1b33f84390 100755
--- a/libgm2/configure
+++ b/libgm2/configure
@@ -2749,14 +2749,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -23533,7 +23533,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libgo/configure b/libgo/configure
index b1a2228fa1b..cdc13f1077f 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -2628,14 +2628,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -17084,7 +17084,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libgomp/configure b/libgomp/configure
index df1fc8df30e..4109b31411b 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -3450,14 +3450,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -17857,7 +17857,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libgrust/configure b/libgrust/configure
index 14a391643c6..cee5c912398 100755
--- a/libgrust/configure
+++ b/libgrust/configure
@@ -2404,14 +2404,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -16982,7 +16982,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libiberty/configure b/libiberty/configure
index 02fbaabe89e..474a8b1dc93 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -2510,9 +2510,9 @@ if test "${srcdir}" = "."; then
libiberty_topdir="${srcdir}/.."
else
if test "${with_target_subdir}" != "."; then
- libiberty_topdir="${srcdir}/${with_multisrctop}../.."
+ libiberty_topdir="${srcdir}/../.."
else
- libiberty_topdir="${srcdir}/${with_multisrctop}.."
+ libiberty_topdir="${srcdir}/.."
fi
fi
else
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 3de5eca0df2..19cd79d3c80 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -28,9 +28,9 @@ if test "${srcdir}" = "."; then
libiberty_topdir="${srcdir}/.."
else
if test "${with_target_subdir}" != "."; then
- libiberty_topdir="${srcdir}/${with_multisrctop}../.."
+ libiberty_topdir="${srcdir}/../.."
else
- libiberty_topdir="${srcdir}/${with_multisrctop}.."
+ libiberty_topdir="${srcdir}/.."
fi
fi
else
diff --git a/libitm/configure b/libitm/configure
index 9ba7fb03a57..ed7c61dd988 100755
--- a/libitm/configure
+++ b/libitm/configure
@@ -3514,14 +3514,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -18954,7 +18954,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libobjc/configure b/libobjc/configure
index 68172549137..db66ecf8e6a 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -2403,14 +2403,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -12617,7 +12617,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libphobos/configure b/libphobos/configure
index 4f5be7d4ff4..815786714a6 100755
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -2484,14 +2484,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -16726,7 +16726,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libquadmath/configure b/libquadmath/configure
index f82dd3d0d6d..bf5ca13d8c0 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -2450,14 +2450,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -14162,7 +14162,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libsanitizer/configure b/libsanitizer/configure
index 6bfd28916d2..05c192a1f13 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -2714,14 +2714,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -18004,7 +18004,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libssp/configure b/libssp/configure
index 0052e03650d..4068425b9f5 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -3081,14 +3081,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -12357,7 +12357,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 69aa246ec7f..cd73b86a142 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -3111,14 +3111,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -56486,7 +56486,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/libvtv/configure b/libvtv/configure
index a7889161c50..41f49592fba 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -2401,14 +2401,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -16752,7 +16752,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
diff --git a/zlib/configure b/zlib/configure
index 202c15f3b51..5d2e56d92e4 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -2260,14 +2260,14 @@ fi
# We may get other options which we leave undocumented:
-# --with-target-subdir, --with-multisrctop, --with-multisubdir
+# --with-target-subdir, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/../.."
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/.."
fi
else
multi_basedir="$srcdir/.."
@@ -12426,7 +12426,6 @@ srcdir="$srcdir"
host="$host"
target="$target"
with_multisubdir="$with_multisubdir"
-with_multisrctop="$with_multisrctop"
with_target_subdir="$with_target_subdir"
ac_configure_args="${multilib_arg} ${ac_configure_args}"
multi_basedir="$multi_basedir"
--
2.49.0
