From ae0daa111e0b7a949c7459faa8d81b63c95d59b1 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 7 Nov 1995 19:04:29 +0000 Subject: [PATCH] * configure.in: Don't treat rs6000-*-lynx* specially. * configure: Rebuild. * config/rslynx: Remove. * Makefile.in: Remove @target_makefile_fragment@. --- binutils/.Sanitize | 1 - binutils/ChangeLog | 7 +++++++ binutils/configure | 37 +++++++++++++++---------------------- binutils/configure.in | 8 +------- 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/binutils/.Sanitize b/binutils/.Sanitize index 5fbc066..a3fb422 100644 --- a/binutils/.Sanitize +++ b/binutils/.Sanitize @@ -43,7 +43,6 @@ bucomm.h coffdump.c coffgrok.c coffgrok.h -config config.in configure configure.bat diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 98f72da..8b0ef6b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 7 14:02:57 1995 Ian Lance Taylor + + * configure.in: Don't treat rs6000-*-lynx* specially. + * configure: Rebuild. + * config/rslynx: Remove. + * Makefile.in: Remove @target_makefile_fragment@. + Mon Nov 6 15:00:50 1995 Ian Lance Taylor * bucomm.h: Include . diff --git a/binutils/configure b/binutils/configure index c71b90b..e01dfb6 100755 --- a/binutils/configure +++ b/binutils/configure @@ -688,10 +688,12 @@ cross_compiling=$ac_cv_c_cross echo "$ac_t""$ac_cv_c_cross" 1>&6 # Put a plausible default for CC_FOR_BUILD in Makefile. -if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' -else - CC_FOR_BUILD=gcc +if test -z "$CC_FOR_BUILD"; then + if test "x$cross_compiling" = "xno"; then + CC_FOR_BUILD='$(CC)' + else + CC_FOR_BUILD=gcc + fi fi @@ -710,7 +712,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error @@ -724,7 +726,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error @@ -757,7 +759,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -790,7 +792,7 @@ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -832,7 +834,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -914,7 +916,7 @@ if eval "test \"`echo '$''{'bu_cv_decl_time_t_types_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -948,7 +950,7 @@ if eval "test \"`echo '$''{'bu_cv_header_utime_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_TIME_H @@ -984,7 +986,7 @@ if eval "test \"`echo '$''{'bu_cv_decl_needed_fprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -1022,7 +1024,6 @@ esac # target-specific stuff: # Canonicalize the secondary target names. -target_makefile_fragment=/dev/null if test -n "$enable_targets"; then for targ in `echo $enable_targets | sed 's/,/ /g'` do @@ -1034,14 +1035,8 @@ if test -n "$enable_targets"; then canon_targets="$canon_targets $targ" fi done -else - # If our target is rs6000 _and nothing else_ then we build only nm! - case $target in - rs6000-*-lynx*) target_makefile_fragment=${srcdir}/config/rslynx ;; - esac fi - all_targets=false BUILD_NLMCONV= NLMCONV_DEFS= @@ -1232,8 +1227,6 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g s%@CPP@%$CPP%g -/@target_makefile_fragment@/r $target_makefile_fragment -s%@target_makefile_fragment@%%g s%@NLMCONV_DEFS@%$NLMCONV_DEFS%g s%@BUILD_NLMCONV@%$BUILD_NLMCONV%g s%@BUILD_SRCONV@%$BUILD_SRCONV%g diff --git a/binutils/configure.in b/binutils/configure.in index b432c1a..7c23cd3 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -43,6 +43,7 @@ AC_PROG_INSTALL BFD_CC_FOR_BUILD AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h) +AC_HEADER_SYS_WAIT AC_CHECK_FUNCS(sbrk utimes) AC_MSG_CHECKING(for time_t in time.h) @@ -94,7 +95,6 @@ BFD_BINARY_FOPEN # target-specific stuff: # Canonicalize the secondary target names. -target_makefile_fragment=/dev/null if test -n "$enable_targets"; then for targ in `echo $enable_targets | sed 's/,/ /g'` do @@ -106,13 +106,7 @@ if test -n "$enable_targets"; then canon_targets="$canon_targets $targ" fi done -else - # If our target is rs6000 _and nothing else_ then we build only nm! - case $target in - rs6000-*-lynx*) target_makefile_fragment=${srcdir}/config/rslynx ;; - esac fi -AC_SUBST_FILE(target_makefile_fragment) all_targets=false BUILD_NLMCONV= -- 2.7.4