diff options
Diffstat (limited to 'contrib/binutils/configure')
| -rwxr-xr-x | contrib/binutils/configure | 74 |
1 files changed, 46 insertions, 28 deletions
diff --git a/contrib/binutils/configure b/contrib/binutils/configure index 57e22d8..e55339f 100755 --- a/contrib/binutils/configure +++ b/contrib/binutils/configure @@ -3,7 +3,7 @@ ### WARNING: this file contains embedded tabs. Do not run untabify on this file. # Configuration script -# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999 +# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -86,7 +86,7 @@ subdirs= target_alias=NOTARGET target_makefile_frag= undefs=NOUNDEFS -version="$Revision: 1.11 $" +version="$Revision: 1.13 $" x11=default bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' @@ -450,7 +450,7 @@ case "${fatal}" in fi ;; esac - echo "Configuring for a ${host_alias} host." 1>&2 + echo "Configuring for a ${host_alias} host." arguments="--host=$host_alias $arguments" else echo 'Config.guess failed to determine the host type. You need to specify one.' 1>&2 @@ -804,46 +804,57 @@ fi # If CC and CXX are not set in the environment, and the Makefile # exists, try to extract them from it. This is to handle running -# ./config.status by hand. -if [ -z "${CC}" ] && [ -r Makefile ]; then - sed -n -e ':loop +# ./config.status by hand. Do the same for various Makefile fragments +# so that they can specify these vars. +for file in Mafefile ${package_makefile_rules_frag} \ + ${site:+config/ms-${site}} ${host_makefile_frag} \ + ${target_makefile_frag} ${package_makefile_frag} +do + if ! test -r $file; then + file=${srcdir}/${file} + if ! test -r $file; then continue; fi + fi + + if [ -z "${CC}" ]; then + sed -n -e ':loop /\\$/ N s/\\\n//g t loop -/^CC[ ]*=/ s/CC[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc - CC=`tail -1 Makefile.cc` - rm -f Makefile.cc -fi +/^CC[ ]*=/ s/CC[ ]*=[ ]*\(.*\)/\1/p' < $file > Makefile.cc + CC=`tail -1 Makefile.cc` + rm -f Makefile.cc + fi -if [ -z "${CFLAGS}" ] && [ -r Makefile ]; then - sed -n -e ':loop + if [ -z "${CFLAGS}" ]; then + sed -n -e ':loop /\\$/ N s/\\\n//g t loop -/^CFLAGS[ ]*=/ s/CFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc - CFLAGS=`tail -1 Makefile.cc` - rm -f Makefile.cc -fi +/^CFLAGS[ ]*=/ s/CFLAGS[ ]*=[ ]*\(.*\)/\1/p' < $file > Makefile.cc + CFLAGS=`tail -1 Makefile.cc` + rm -f Makefile.cc + fi -if [ -z "${CXX}" ] && [ -r Makefile ]; then - sed -n -e ':loop + if [ -z "${CXX}" ]; then + sed -n -e ':loop /\\$/ N s/\\\n//g t loop -/^CXX[ ]*=/ s/CXX[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc - CXX=`tail -1 Makefile.cc` - rm -f Makefile.cc -fi +/^CXX[ ]*=/ s/CXX[ ]*=[ ]*\(.*\)/\1/p' < $file > Makefile.cc + CXX=`tail -1 Makefile.cc` + rm -f Makefile.cc + fi -if [ -z "${CXXFLAGS}" ] && [ -r Makefile ]; then - sed -n -e ':loop + if [ -z "${CXXFLAGS}" ]; then + sed -n -e ':loop /\\$/ N s/\\\n//g t loop -/^CXXFLAGS[ ]*=/ s/CXXFLAGS[ ]*=[ ]*\(.*\)/\1/p' < Makefile > Makefile.cc - CXXFLAGS=`tail -1 Makefile.cc` - rm -f Makefile.cc -fi +/^CXXFLAGS[ ]*=/ s/CXXFLAGS[ ]*=[ ]*\(.*\)/\1/p' < $file > Makefile.cc + CXXFLAGS=`tail -1 Makefile.cc` + rm -f Makefile.cc + fi +done # Generate a default definition for YACC. This is used if the makefile can't # locate bison or byacc in objdir. @@ -1078,6 +1089,12 @@ else GDB_TK="" fi +all_build_modules= +if test x"${build_alias}" != x"${host_alias}" +then + all_build_modules='$(ALL_BUILD_MODULES_LIST)' +fi + for subdir in . ${subdirs} ; do # ${subdir} is relative path from . to the directory we're currently @@ -1378,6 +1395,7 @@ EOF -e "s|^oldincludedir[ ]*=.*$|oldincludedir = ${oldincludedir}|" \ -e "s|^infodir[ ]*=.*$|infodir = ${infodir}|" \ -e "s|^mandir[ ]*=.*$|mandir = ${mandir}|" \ + -e "s|^ALL_BUILD_MODULES =.*|ALL_BUILD_MODULES =${all_build_modules}|" \ -e "/^CC[ ]*=/{ :loop1 /\\\\$/ N |
