diff --git a/configure b/configure index d328bcbb10..715ac10b11 100755 --- a/configure +++ b/configure @@ -3541,7 +3541,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac # Default versions for the gnu tools we build default_toolchain_family=`cat ${srcdir}/config/toolchain_def` exp_gcc_version=`cat ${srcdir}/config/gcc_exp` -default_binutils_version=`cat ${srcdir}/config/binutils_def` default_llvm_version=`cat ${srcdir}/config/llvm_def` exp_binutils_version=`cat ${srcdir}/config/binutils_exp` default_grub2_version=`cat ${srcdir}/arch/all-pc/boot/grub2_def` @@ -11725,6 +11724,11 @@ printf "%s\n" "$AROS_CROSSTOOLSDIR" >&6; } #----------------------------------------------------------------------------- if test "$aros_toolchain" = "gnu" ; then + if test -f "${srcdir}/arch/${aros_target_cpu}-all/binutils_def"; then + default_binutils_version=$(cat "${srcdir}/arch/${aros_target_cpu}-all/binutils_def") + else + default_binutils_version=$(cat "${srcdir}/config/binutils_def") + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what specific target binutils version to use" >&5 printf %s "checking what specific target binutils version to use... " >&6; } fi diff --git a/configure.in b/configure.in index 3d7bfa134d..8c704c613c 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,6 @@ AC_CANONICAL_HOST # Default versions for the gnu tools we build default_toolchain_family=`cat ${srcdir}/config/toolchain_def` exp_gcc_version=`cat ${srcdir}/config/gcc_exp` -default_binutils_version=`cat ${srcdir}/config/binutils_def` default_llvm_version=`cat ${srcdir}/config/llvm_def` exp_binutils_version=`cat ${srcdir}/config/binutils_exp` default_grub2_version=`cat ${srcdir}/arch/all-pc/boot/grub2_def` @@ -2445,6 +2444,11 @@ AC_MSG_RESULT($AROS_CROSSTOOLSDIR) #----------------------------------------------------------------------------- if test "$aros_toolchain" = "gnu" ; then + if test -f "${srcdir}/arch/${aros_target_cpu}-all/binutils_def"; then + default_binutils_version=$(cat "${srcdir}/arch/${aros_target_cpu}-all/binutils_def") + else + default_binutils_version=$(cat "${srcdir}/config/binutils_def") + fi AC_MSG_CHECKING([what specific target binutils version to use]) fi AC_ARG_WITH(binutils-version,AS_HELP_STRING([--with-binutils-version=VERSION],[Use binutils-VERSION for building AROS]),use_binutils_version="$withval",use_binutils_version="")