Don't hardcode CC and CFLAGS to -O3

This commit is contained in:
Kris Kennaway 2001-04-30 10:13:07 +00:00
parent 5d2789d5da
commit 00eee57c87
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42075
2 changed files with 82 additions and 38 deletions

View File

@ -1,19 +1,41 @@
*** configure.orig Fri May 12 00:33:57 2000
--- configure Fri May 12 00:39:34 2000
***************
*** 222,228 ****
CONTRIBFLAGS = $CONTRIBFLAGS
CPP = $CPP
DESTBIN = $DEST/bin
! DESTLIB = $DEST/lib/felt
DESTMAN = $DEST/man
INSTALL = sh \$(TOPDIR)/etc/install.sh -c
LDOPTS =
--- 222,228 ----
CONTRIBFLAGS = $CONTRIBFLAGS
CPP = $CPP
DESTBIN = $DEST/bin
! DESTLIB = $DEST/share/felt
DESTMAN = $DEST/man
INSTALL = sh \$(TOPDIR)/etc/install.sh -c
LDOPTS =
--- configure.orig Mon May 29 23:29:15 1995
+++ configure Mon Apr 30 03:03:43 2001
@@ -71,7 +71,6 @@
echo Configuring ...
-which CC gcc
which RANLIB ranlib
which CAT cat
which TRUE true
@@ -136,7 +135,6 @@
# provide worst-case defaults
-: ${CC:=cc}
: ${RANLIB:=$TRUE}
: ${READDIR:=/lib}
: ${DEST}:=.}
@@ -145,12 +143,11 @@
: ${X11INC:=.}
: ${X11LIB:=.}
-CC=`basename $CC`
RANLIB=`basename $RANLIB`
READDIR=`dirname $READDIR`
CONTRIBDIR=none
-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi
+CCOPTS=${CFLAGS}
# defaults for known architectures that fail the above
@@ -222,7 +219,7 @@
CONTRIBFLAGS = $CONTRIBFLAGS
CPP = $CPP
DESTBIN = $DEST/bin
-DESTLIB = $DEST/lib/felt
+DESTLIB = $DEST/share/felt
DESTMAN = $DEST/man
INSTALL = sh \$(TOPDIR)/etc/install.sh -c
LDOPTS =

View File

@ -1,19 +1,41 @@
*** configure.orig Fri May 12 00:33:57 2000
--- configure Fri May 12 00:39:34 2000
***************
*** 222,228 ****
CONTRIBFLAGS = $CONTRIBFLAGS
CPP = $CPP
DESTBIN = $DEST/bin
! DESTLIB = $DEST/lib/felt
DESTMAN = $DEST/man
INSTALL = sh \$(TOPDIR)/etc/install.sh -c
LDOPTS =
--- 222,228 ----
CONTRIBFLAGS = $CONTRIBFLAGS
CPP = $CPP
DESTBIN = $DEST/bin
! DESTLIB = $DEST/share/felt
DESTMAN = $DEST/man
INSTALL = sh \$(TOPDIR)/etc/install.sh -c
LDOPTS =
--- configure.orig Mon May 29 23:29:15 1995
+++ configure Mon Apr 30 03:03:43 2001
@@ -71,7 +71,6 @@
echo Configuring ...
-which CC gcc
which RANLIB ranlib
which CAT cat
which TRUE true
@@ -136,7 +135,6 @@
# provide worst-case defaults
-: ${CC:=cc}
: ${RANLIB:=$TRUE}
: ${READDIR:=/lib}
: ${DEST}:=.}
@@ -145,12 +143,11 @@
: ${X11INC:=.}
: ${X11LIB:=.}
-CC=`basename $CC`
RANLIB=`basename $RANLIB`
READDIR=`dirname $READDIR`
CONTRIBDIR=none
-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi
+CCOPTS=${CFLAGS}
# defaults for known architectures that fail the above
@@ -222,7 +219,7 @@
CONTRIBFLAGS = $CONTRIBFLAGS
CPP = $CPP
DESTBIN = $DEST/bin
-DESTLIB = $DEST/lib/felt
+DESTLIB = $DEST/share/felt
DESTMAN = $DEST/man
INSTALL = sh \$(TOPDIR)/etc/install.sh -c
LDOPTS =