diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | configure | 31 |
3 files changed, 37 insertions, 4 deletions
@@ -1,5 +1,9 @@ Mon Jun 16 11:11:10 1997 Ian Lance Taylor <ian@cygnus.com> + * configure: Set CFLAGS and CXXFLAGS, and substitute them into + Makefile. From Jeff Makey <jeff@cts.com>. + * Makefile.in: Add comment for CFLAGS and CXXFLAGS. + * Makefile.in (DISTBISONFILES): Remove. (taz): Don't futz with DISTBISONFILES. Change BISON to use $(DEFAULT_YACC). diff --git a/Makefile.in b/Makefile.in index 21fdd02..f1acf87 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,9 +62,10 @@ HOST_CC = $(CC_FOR_BUILD) HOST_PREFIX = HOST_PREFIX_1 = loser- -# We don't specify -g -O because many compilers don't support -g -O, -# and/or -O is broken in and of itself. +# These flag values are normally overridden by the configure script. CFLAGS = -g +CXXFLAGS = -g -O2 + LIBCFLAGS = $(CFLAGS) CFLAGS_FOR_TARGET = $(CFLAGS) LDFLAGS_FOR_TARGET = @@ -79,7 +80,6 @@ CHILL_LIB = -lchill CXX = c++ # Use -O2 to stress test the compiler. -CXXFLAGS = -g -O2 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates CXXFLAGS_FOR_TARGET = $(CXXFLAGS) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates @@ -760,7 +760,9 @@ t loop AS=${AS-${host_alias}-as} AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as} CC=${CC-${host_alias}-gcc} + CFLAGS=${CFLAGS-"-g -O2"} CXX=${CXX-${host_alias}-c++} + CXXFLAGS=${CXXFLAGS-"-g -O2"} CC_FOR_BUILD=${CC_FOR_BUILD-gcc} CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc} CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++} @@ -830,7 +832,16 @@ else for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/gcc; then - CC="gcc -O2" + CC="gcc" + echo 'void f(){}' > conftest.c + if test -z "`${CC} -g -c conftest.c 2>&1`"; then + CFLAGS=${CFLAGS-"-g -O2"} + CXXFLAGS=${CFLAGS-"-g -O2"} + else + CFLAGS=${CFLAGS-"-O2"} + CXXFLAGS=${CFLAGS-"-O2"} + fi + rm -f conftest* break fi done @@ -839,10 +850,14 @@ else fi CXX=${CXX-"c++"} + CFLAGS=${CFLAGS-"-g"} + CXXFLAGS=${CXXFLAGS-"-g -O2"} fi export CC export CXX +export CFLAGS +export CXXFLAGS case "$host" in *go32*) @@ -1121,6 +1136,20 @@ EOF t loop2 s%^CXX[ ]*=.*$%CXX = ${CXX}% }" \ + -e "/^CFLAGS[ ]*=/{ + :loop3 + /\\\\$/ N + s/\\\\\\n//g + t loop3 + s%^CFLAGS[ ]*=.*$%CFLAGS = ${CFLAGS}% + }" \ + -e "/^CXXFLAGS[ ]*=/{ + :loop4 + /\\\\$/ N + s/\\\\\\n//g + t loop4 + s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% + }" \ -e "s:^SHELL[ ]*=.*$:SHELL = ${config_shell}:" \ -e "s:^GDB_TK[ ]*=.*$:GDB_TK = ${GDB_TK}:" \ -e "s|^srcdir[ ]*=.*$|srcdir = ${makesrcdir}|" \ |