aboutsummaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in66
1 files changed, 35 insertions, 31 deletions
diff --git a/configure.in b/configure.in
index 68a08d0..fdfeab6 100644
--- a/configure.in
+++ b/configure.in
@@ -526,39 +526,16 @@ if [ "${build}" != "${host}" ]; then
noconfigdirs="$noconfigdirs expect dejagnu make texinfo diff"
fi
-# Set with_gnu_as and with_gnu_ld as appropriate.
-#
-# This is done by determining whether or not the appropriate directory
-# is available, and by checking whether or not specific configurations
-# have requested that this magic not happen.
-#
-# The command line options always override the explicit settings in
-# configure.in, and the settings in configure.in override this magic.
-#
-# If the default for a toolchain is to use GNU as and ld, and you don't
-# want to do that, then you should use the --without-gnu-as and
-# --without-gnu-ld options for the configure script.
-
-if [ x${use_gnu_as} = x ] ; then
- if [ x${with_gnu_as} != xno ] ; then
- if echo " ${configdirs} " | grep " ${gasdir} " > /dev/null 2>&1 && [ -d ${srcdir}/${gasdir} ] ; then
- with_gnu_as=yes
- withoptions="$withoptions --with-gnu-as"
- fi
- else
- noconfigdirs="$noconfigdirs gas"
- fi
+# Make sure we don't let GNU ld be added if we didn't want it.
+if [ x$with_gnu_ld = xno ]; then
+ use_gnu_ld=no
+ noconfigdirs="$noconfigdirs ld"
fi
-if [ x${use_gnu_ld} = x ] ; then
- if [ x${with_gnu_ld} != xno ]; then
- if echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 && [ -d ${srcdir}/ld ] ; then
- with_gnu_ld=yes
- withoptions="$withoptions --with-gnu-ld"
- fi
- else
- noconfigdirs="$noconfigdirs ld"
- fi
+# Make sure we don't let GNU as be added if we didn't want it.
+if [ x$with_gnu_as = xno ]; then
+ use_gnu_as=no
+ noconfigdirs="$noconfigdirs gas"
fi
# Remove the entries in $skipdirs and $noconfigdirs from $configdirs and
@@ -658,6 +635,33 @@ if [ -n "${notsupp}" ] && [ -z "${norecursion}" ]; then
echo " (Any other directories should still work fine.)" 1>&2
fi
+# Set with_gnu_as and with_gnu_ld as appropriate.
+#
+# This is done by determining whether or not the appropriate directory
+# is available, and by checking whether or not specific configurations
+# have requested that this magic not happen.
+#
+# The command line options always override the explicit settings in
+# configure.in, and the settings in configure.in override this magic.
+#
+# If the default for a toolchain is to use GNU as and ld, and you don't
+# want to do that, then you should use the --without-gnu-as and
+# --without-gnu-ld options for the configure script.
+
+if [ x${use_gnu_as} = x ] ; then
+ if [ x${with_gnu_as} != xno ] && echo " ${configdirs} " | grep " ${gasdir} " > /dev/null 2>&1 && [ -d ${srcdir}/${gasdir} ] ; then
+ with_gnu_as=yes
+ withoptions="$withoptions --with-gnu-as"
+ fi
+fi
+
+if [ x${use_gnu_ld} = x ] ; then
+ if [ x${with_gnu_ld} != xno ] && echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 && [ -d ${srcdir}/ld ] ; then
+ with_gnu_ld=yes
+ withoptions="$withoptions --with-gnu-ld"
+ fi
+fi
+
if [ x${enable_shared} = xyes ]; then
case "${target}" in
hppa*) target_makefile_frag=config/mt-papic ;;