From 65eed095956e8bd3a2fbd3ba145ae8639c02eefd Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 15 Feb 1996 22:05:32 +0000 Subject: [PATCH] * configure.in: Call AC_PROG_CC before configure.host. Don't substitute CFLAGS. * configure: Rebuild. * configure.host: Don't set information which autoconf should figure out, namely CC, CFLAGS, LDFLAGS, AR, and RANLIB. * Makefile.in (CFLAGS): Set to -g, not @CFLAGS@. --- bfd/ChangeLog | 7 +++++++ bfd/Makefile.in | 2 +- bfd/configure.host | 43 +++---------------------------------------- 3 files changed, 11 insertions(+), 41 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b57f1b4..b301d81 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,12 @@ Thu Feb 15 11:29:13 1996 Ian Lance Taylor + * configure.in: Call AC_PROG_CC before configure.host. Don't + substitute CFLAGS. + * configure: Rebuild. + * configure.host: Don't set information which autoconf should + figure out, namely CC, CFLAGS, LDFLAGS, AR, and RANLIB. + * Makefile.in (CFLAGS): Set to -g, not @CFLAGS@. + * configure.host: Remove go32 and win32 host information, since it should no longer be needed. diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 3c58486..f37b97f 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -54,7 +54,7 @@ INSTALL_DATA = @INSTALL_DATA@ AR = @AR@ AR_FLAGS = rc CC = @CC@ -CFLAGS = @CFLAGS@ +CFLAGS = -g MAKEINFO = makeinfo RANLIB = @RANLIB@ diff --git a/bfd/configure.host b/bfd/configure.host index 2fac0ed..a7150c5 100644 --- a/bfd/configure.host +++ b/bfd/configure.host @@ -7,11 +7,6 @@ # in its per-host part. # This sets the following shell variables: -# CC compiler to use (only if needed and not already set) -# CFLAGS override CFLAGS (only if needed and not already set) -# LDFLAGS override LDFLAGS (only if needed and not already set) -# AR archiver to use (only if needed and not already set) -# RANLIB ranlib to use (only if needed and not already set) # HDEFINES host specific compiler options # host64 set to true if this is a 64 bit host # HOST_64BIT_TYPE host 64 bit type @@ -28,18 +23,9 @@ host64=false HOST_64BIT_TYPE= case "${host}" in -# WHEN ADDING ENTRIES TO THIS MATRIX: -# Make sure that the left side always has two dashes. Otherwise you -# can get spurious matches. Even for unambiguous cases, do this as a -# convention, else the table becomes a real mess to understand and maintain. -# -# Note that these entries cannot be fully alphabetical. Don't try. -# The order of matching is critical when multiple lines could match. alpha-*-*) host64=true; HOST_64BIT_TYPE=long ;; -a29k-*-*) CC=${CC-u3cc}; AR=${AR-u3ar} ;; - hppa*-*-hpux*) HDEFINES=-DHOST_HPPAHPUX ;; hppa*-*-hiux*) HDEFINES=-DHOST_HPPAHPUX ;; hppa*-*-bsd*) HDEFINES=-DHOST_HPPABSD ;; @@ -48,40 +34,17 @@ hppa*-*-osf*) HDEFINES=-DHOST_HPPAOSF ;; i[345]86-sequent-bsd*) HDEFINES=-Dshared=genshared ;; i[345]86-sequent-sysv4*) ;; i[345]86-sequent-sysv*) HDEFINES=-Dshared=genshared ;; -i[345]86-ncr*-sysv4*) CC=${CC-/usr/ccs/ATT/cc} - test -z "$CFLAGS" && CFLAGS=" " - ;; mips-dec-netbsd*) ;; mips-dec-*) HDEFINES="-G 4" ;; -mips-sgi-irix3*) HDEFINES="-G 4" - test -z "$LDFLAGS" && LDFLAGS=-lmalloc - ;; -mips-sgi-irix4*) HDEFINES="-G 4" - test -z "$LDFLAGS" && LDFLAGS=-lmalloc - ;; +mips-sgi-irix3*) HDEFINES="-G 4" ;; +mips-sgi-irix4*) HDEFINES="-G 4" ;; mips-*-sysv4*) ;; mips-*-sysv*) HDEFINES="-G 4" ;; mips-*-riscos*) HDEFINES="-G 4" ;; -m68*-apollo*-sysv*) # sef@cygnus.com says this is how to compile - # on an apollo in the SysV environment. - test -z "$CC" && CC="cc -A nansi -A cpu,3000 -A runtype,any -A systype,any -DSHORT_ENUM_BUG -DUSG -U__STDC__ -Dm68000=mc68000" - ;; m68*-hp-hpux*) HDEFINES=-DHOST_HP300HPUX ;; -m88*-*-dgux*) test -z "$CC" && CC="gcc -Wall -ansi -D__using_DGUX" - ;; - -romp-*-*) # hc/pcc just can't cut it - CC=${CC-gcc} - ;; - -rs6000-*-aix4) HDEFINES=-DHOST_AIX ;; -rs6000-*-*) HDEFINES=-DHOST_AIX ;; -powerpc-*-aix4*) HDEFINES=-DHOST_AIX ;; -powerpc-*-aix*) HDEFINES=-DHOST_AIX ;; - esac # If we are configuring with --enable-shared, adjust the shared @@ -145,7 +108,7 @@ fi case "${host}" in *-*-sunos*) echo 'main () { }' > conftest.c - ${CC-gcc} -o conftest -Wl,-rpath= conftest.c >/dev/null 2>conftest.t + ${CC} -o conftest -Wl,-rpath= conftest.c >/dev/null 2>conftest.t if grep 'unrecognized' conftest.t >/dev/null 2>&1; then : elif grep 'No such file' conftest.t >/dev/null 2>&1; then -- 2.7.4