diff options
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/gcc/configure b/gcc/configure index e782ec5..339304b 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2833,6 +2833,22 @@ _ACEOF fi +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi + # autoconf is lame and doesn't give us any substitution variable for this. if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then NO_MINUS_C_MINUS_O=yes @@ -7348,7 +7364,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:7351: version of makeinfo is $ac_prog_version" >&5 + echo "configure:7367: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.[2-9]*) @@ -14621,14 +14637,6 @@ objdir=`${PWDCMD-pwd}` -# If it doesn't already exist, create document directory -echo "checking for the document directory." 1>&2 -if test -d doc ; then - true -else - mkdir doc -fi - # Echo link setup. if test x${build} = x${host} ; then if test x${host} = x${target} ; then @@ -16031,7 +16039,7 @@ case ${CONFIG_HEADERS} in echo > cstamp-h ;; esac # Make sure all the subdirs exist. -for d in $subdirs +for d in $subdirs doc build do test -d $d || mkdir $d done |