diff --git a/ChangeLog b/ChangeLog index 2a4402948c..975a4b848b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1997-09-15 02:37 Ulrich Drepper + + * config/mt-linux: Define CXXFLAGS to make sure -fvtable-thunks is + used. + * configure.in: Name Linux target fragment. + + * configure: Rewrite so that project Makefile fragment is inserted + first and appears last in the resulting Makefile. + Tue Sep 16 09:55:07 1997 Andrew Cagney * Makefile.in (install-itcl): Install tcl first. diff --git a/configure b/configure index 0185f0e719..3fae2e7354 100755 --- a/configure +++ b/configure @@ -712,6 +712,16 @@ t loop rm -f Makefile.cc fi +if [ -z "${CFLAGS}" -a -r Makefile ]; 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 + if [ -z "${CXX}" -a -r Makefile ]; then sed -n -e ':loop /\\$/ N @@ -722,6 +732,16 @@ t loop rm -f Makefile.cc fi +if [ -z "${CXXFLAGS}" -a -r Makefile ]; 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 + # Generate a default definition for YACC. This is used if the makefile can't # locate bison or byacc in objdir. @@ -1025,79 +1045,78 @@ EOF if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then - # Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem - rm -f ${subdir}/Makefile.tem - case "${site}" in - "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;; - *) - site_makefile_frag=${srcdir}/config/ms-${site} - - if [ -f ${site_makefile_frag} ] ; then - sed -e "/^####/ r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} \ - > ${subdir}/Makefile.tem - else - cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem - site_makefile_frag= - fi - ;; - esac - # working copy now in ${subdir}/Makefile.tem - - # Conditionalize the makefile for this host. - rm -f ${Makefile} - case "${host_makefile_frag}" in - "") mv ${subdir}/Makefile.tem ${Makefile} ;; - *) - if [ ! -f ${host_makefile_frag} ] ; then - host_makefile_frag=${srcdir}/${host_makefile_frag} - fi - if [ -f ${host_makefile_frag} ] ; then - sed -e "/^####/ r ${host_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile} - else - echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2 - echo '***' is missing in ${PWD=`pwd`}. 1>&2 - mv ${subdir}/Makefile.tem ${Makefile} - fi - esac - # working copy now in ${Makefile} - - # Conditionalize the makefile for this target. - rm -f ${subdir}/Makefile.tem - case "${target_makefile_frag}" in - "") mv ${Makefile} ${subdir}/Makefile.tem ;; - *) - if [ ! -f ${target_makefile_frag} ] ; then - target_makefile_frag=${srcdir}/${target_makefile_frag} - fi - if [ -f ${target_makefile_frag} ] ; then - sed -e "/^####/ r ${target_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem - else - mv ${Makefile} ${subdir}/Makefile.tem - target_makefile_frag= - fi - ;; - esac - # real copy now in ${subdir}/Makefile.tem - - # Conditionalize the makefile for this package. - rm -f ${Makefile} + # Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem. + rm -f ${subdir}/${Makefile}.tem case "${package_makefile_frag}" in - "") mv ${subdir}/Makefile.tem ${Makefile} ;; + "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;; *) if [ ! -f ${package_makefile_frag} ] ; then package_makefile_frag=${srcdir}/${package_makefile_frag} fi if [ -f ${package_makefile_frag} ] ; then - sed -e "/^####/ r ${package_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile} - rm -f ${subdir}/Makefile.tem + sed -e "/^####/ r ${package_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem else echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2 echo '***' is missing in ${PWD=`pwd`}. 1>&2 - mv ${subdir}/Makefile.tem ${Makefile} + cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem fi esac + # working copy now in ${Makefile}.tem + + # Conditionalize for this site. + rm -f ${Makefile} + case "${site}" in + "") mv ${subdir}/Makefile.tem ${Makefile} ;; + *) + site_makefile_frag=${srcdir}/config/ms-${site} + + if [ -f ${site_makefile_frag} ] ; then + sed -e "/^####/ r ${site_makefile_frag}" ${subdir}/Makefile.tem \ + > ${Makefile} + else + mv ${subdir}/Makefile.tem ${Makefile} + site_makefile_frag= + fi + ;; + esac # working copy now in ${Makefile} + # Conditionalize the makefile for this host. + rm -f ${subdir}/Makefile.tem + case "${host_makefile_frag}" in + "") mv ${Makefile} ${subdir}/Makefile.tem ;; + *) + if [ ! -f ${host_makefile_frag} ] ; then + host_makefile_frag=${srcdir}/${host_makefile_frag} + fi + if [ -f ${host_makefile_frag} ] ; then + sed -e "/^####/ r ${host_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem + else + echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2 + echo '***' is missing in ${PWD=`pwd`}. 1>&2 + mv ${Makefile} ${subdir}/Makefile.tem + fi + esac + # working copy now in ${subdir)/Makefile.tem + + # Conditionalize the makefile for this target. + rm -f ${Makefile} + case "${target_makefile_frag}" in + "") mv ${subdir}/Makefile.tem ${Makefile} ;; + *) + if [ ! -f ${target_makefile_frag} ] ; then + target_makefile_frag=${srcdir}/${target_makefile_frag} + fi + if [ -f ${target_makefile_frag} ] ; then + sed -e "/^####/ r ${target_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile} + else + mv ${subdir}/Makefile.tem ${Makefile} + target_makefile_frag= + fi + ;; + esac + # real copy now in ${Makefile} + mv ${Makefile} ${subdir}/Makefile.tem # real copy now in ${subdir}/Makefile.tem diff --git a/configure.in b/configure.in index 50a2bf2c9d..5eea34d42a 100644 --- a/configure.in +++ b/configure.in @@ -220,6 +220,7 @@ case "${target}" in mips64vr5900*-*-*) target_makefile_frag=config/mt-r5900 ;; # end-sanitize-r5900 powerpc-*-netware*) target_makefile_frag=config/mt-netware ;; + *-*-linux-gnu) target_makefile_frag=config/mt-linux ;; esac skipdirs=