Wed Apr 12 16:06:01 1995 Jason Merrill <jason@phydeaux.cygnus.com>

	* test-build.mk: Enable building of shared libraries on IRIX 5 and
        OSF/1.  Fix compiler flags.
	* build-all.mk: Support Linux and OSF/1 3.0.  Fix compiler flags.

diff --git a/build-all.mk b/build-all.mk
index 85aa0e51f50a8af02ccf1553b9835fee0c3495f9..ab7ce5c54b58a7aab0f1be1e73606fa3625e0bee 100644 (file)
--- a/build-all.mk
+++ b/build-all.mk
@@ -47,9 +47,10 @@ endif
 
 NATIVE  = native
 
-GCC     = gcc -O2 
+GCC     = gcc
 CFLAGS  = -g
-CXXFLAGS = -g -O2 -fexternal-templates
+GNUCFLAGS= -g -O2
+CXXFLAGS = -g -O2
 MAKEINFOFLAGS =
 
 log    = 1>$(canonhost)-build-log 2>&1
@@ -109,6 +110,24 @@ endif
 ifeq ($(canonhost),rs6000-lynx-lynxos)
 canonhost := rs6000-lynx
 endif
+ifeq ($(canonhost),i386-unknown-linux)
+canonhost := i386-linux
+endif
+ifeq ($(canonhost),i486-unknown-linux)
+canonhost := i486-linux
+endif
+ifeq ($(canonhost),i586-unknown-linux)
+canonhost := i486-linux
+endif
+ifeq ($(canonhost),i386-unknown-linuxelf)
+canonhost := i386-linuxelf
+endif
+ifeq ($(canonhost),i486-unknown-linuxelf)
+canonhost := i486-linuxelf
+endif
+ifeq ($(canonhost),i586-unknown-linuxelf)
+canonhost := i486-linuxelf
+endif
 
 #
 # The following TARGETS variable settings probably ought to
@@ -172,7 +191,7 @@ CC = cc -Wf,-XNg1000
 all: all-cygnus
 endif
 
-ifeq ($(canonhost),alpha-dec-osf1.3)
+ifeq ($(patsubst alpha-dec-osf%,alpha,$(canonhost)),alpha)
 TARGETS = $(NATIVE)
 CC = cc
 all: all-cygnus
@@ -278,10 +297,16 @@ all: all-cygnus
 SHELL=/bin/bash
 endif
 
+ifeq ($(patsubst %-linux,linux,$(patsubst %-linuxelf,linux,$(canonhost))),linux)
+TARGETS = $(NATIVE)
+all: all-cygnus
+endif
+
 FLAGS_TO_PASS := \
        "GCC=$(GCC)" \
        "CC=$(CC)" \
        "CFLAGS=$(CFLAGS)" \
+       "GNUCFLAGS=$(GNUCFLAGS)" \
        "CXXFLAGS=$(CXXFLAGS)" \
        "host=$(canonhost)" \
        "MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
@@ -293,6 +318,10 @@ ifeq ($(patsubst %-lynx,lynx,$(canonhost)),lynx)
 FLAGS_TO_PASS := $(FLAGS_TO_PASS) "GNU_MAKE=$(MAKE)" "CONFIG_SHELL=/bin/bash"
 endif
 
+ifeq ($(patsubst %-linux,linux,$(patsubst %-linuxelf,linux,$(canonhost))),linux)
+FLAGS_TO_PASS := $(FLAGS_TO_PASS) "GNU_MAKE=$(MAKE)"
+endif
+
 all-emacs:
        @echo build started at `date`
        [ -d $(INSTALLDIR) ] || mkdir $(INSTALLDIR)