diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 60 |
1 files changed, 12 insertions, 48 deletions
@@ -1415,22 +1415,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -echo "$as_me: former value: \`$ac_old_val'" >&2;} - { echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -echo "$as_me: current value: \`$ac_new_val'" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -2057,7 +2048,7 @@ if test "${ENABLE_GOLD}" = "yes"; then if test "$is_elf" = "yes"; then # Check for target supported by gold. case "${target}" in - i?86-*-* | x86_64-*-* | sparc*-*-*) + i?86-*-* | x86_64-*-*) configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" ;; esac @@ -2335,7 +2326,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}" ;; avr-*-*) - noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp" + noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" ;; bfin-*-*) noconfigdirs="$noconfigdirs gdb" @@ -2349,9 +2340,6 @@ case "${target}" in c54x*-*-* | tic54x-*-*) noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib" ;; - cr16-*-*) - noconfigdirs="$noconfigdirs ${libgcj} gdb" - ;; cris-*-* | crisv32-*-*) unsupported_languages="$unsupported_languages java" case "${target}" in @@ -2792,36 +2780,12 @@ case "${host}" in host_makefile_frag="config/mh-djgpp" ;; *-cygwin*) - -echo "$as_me:$LINENO: checking to see if cat works as expected" >&5 -echo $ECHO_N "checking to see if cat works as expected... $ECHO_C" >&6 -echo a >cygwin-cat-check -if test `cat cygwin-cat-check` == a ; then - rm cygwin-cat-check - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - rm cygwin-cat-check - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: The cat command does not ignore carriage return characters. - Please either mount the build directory in binary mode or run the following - commands before running any configure script: -set -o igncr -export SHELLOPTS - " >&5 -echo "$as_me: error: The cat command does not ignore carriage return characters. - Please either mount the build directory in binary mode or run the following - commands before running any configure script: -set -o igncr -export SHELLOPTS - " >&2;} - { (exit 1); exit 1; }; } -fi - host_makefile_frag="config/mh-cygwin" ;; - *-mingw*) + *-mingw32*) + host_makefile_frag="config/mh-mingw" + ;; + *-mingw64*) host_makefile_frag="config/mh-mingw" ;; *-interix*) |