diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-04 21:05:35 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-09-04 21:05:35 +0000 |
| commit | 4a01eadc8053727f073fff4050e67f607b864b62 (patch) | |
| tree | e4cefe14ec2e5deefdccd3135add0ace8c9d0073 /include | |
| parent | 988af42c43bd900c356b19464dee165845b13317 (diff) | |
| download | ATCD-4a01eadc8053727f073fff4050e67f607b864b62.tar.gz | |
ChangeLogTag: Wed Sep 4 20:59:40 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_irix5.2.GNU | 5 | ||||
| -rw-r--r-- | include/makeinclude/platform_m88k.GNU | 5 | ||||
| -rw-r--r-- | include/makeinclude/platform_netbsd.GNU | 34 | ||||
| -rw-r--r-- | include/makeinclude/platform_qnx_neutrino.GNU | 5 | ||||
| -rw-r--r-- | include/makeinclude/platform_qnx_rtp_gcc.GNU | 5 | ||||
| -rw-r--r-- | include/makeinclude/platform_sco-nothread.GNU | 5 |
6 files changed, 22 insertions, 37 deletions
diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU index 57a80d16440..8ae4e92896e 100644 --- a/include/makeinclude/platform_irix5.2.GNU +++ b/include/makeinclude/platform_irix5.2.GNU @@ -8,7 +8,10 @@ optimize = 1 MAKE = gmake CC = gcc CXX = g++ -CCFLAGS += $(CFLAGS) -fno-implicit-templates + +include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU + +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) DCFLAGS += -g DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU index 29b91dcdecb..3f2c1afa6c1 100644 --- a/include/makeinclude/platform_m88k.GNU +++ b/include/makeinclude/platform_m88k.GNU @@ -7,8 +7,11 @@ optimize = 1 CC = gcc CXX = g++ + +include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU + CFLAGS += -w -CCFLAGS += $(CFLAGS) -D__m88k__ -fno-implicit-templates -fno-strict-prototypes +CCFLAGS += $(CFLAGS) -D__m88k__ $(TEMPLATES_FLAG) -fno-strict-prototypes DCFLAGS += -g DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_netbsd.GNU b/include/makeinclude/platform_netbsd.GNU index 907490cd65e..66512468e18 100644 --- a/include/makeinclude/platform_netbsd.GNU +++ b/include/makeinclude/platform_netbsd.GNU @@ -12,40 +12,10 @@ versioned_so = 1 CC = gcc CXX = g++ -CXX_VERSION := $(shell $(CXX) -dumpversion) - -# If no option has been specified, try to enable implicit_templates based -# on the version of the compiler. -# -ifeq ($(implicit_templates),) - ifeq (2.95,$(findstring 2.95,$(CXX_VERSION))) - implicit_templates = 1 - else - ifeq (3.,$(findstring 3.,$(CXX_VERSION))) - implicit_templates = 1 - endif - ifeq (2.96,$(findstring 2.96,$(CXX_VERSION))) - implicit_templates = 1 - endif - endif -endif - -# User didn't specify and we couldn't guess if this version of the compiler -# works fine with implicit template instantiation. Turn if off. This could -# as well go into the previous check but GNU Make conditionals are lame. -# -ifeq ($(implicit_templates),) - implicit_templates = 0 -endif - -ifeq ($(implicit_templates),0) - ifeq ($(IMPLICIT_TEMPLATES_FLAG),) # Turn on flags if none is speficied. - IMPLICIT_TEMPLATES_FLAG=-fno-implicit-templates - endif -endif +include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU CFLAGS += -w -fno-strict-prototypes -CCFLAGS += $(CFLAGS) -fno-implicit-templates +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) DCFLAGS += -g DLD = ld LD = $(CXX) diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU index 7eea18c0be2..e8ec2746086 100644 --- a/include/makeinclude/platform_qnx_neutrino.GNU +++ b/include/makeinclude/platform_qnx_neutrino.GNU @@ -17,8 +17,11 @@ endif # ! repo CC = i386-nto-gcc CXX = i386-nto-g++ + +include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU + CFLAGS += -pipe -W -Wall -Wpointer-arith -CCFLAGS += $(CFLAGS) -fno-implicit-templates +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) DCFLAGS += -g DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_qnx_rtp_gcc.GNU b/include/makeinclude/platform_qnx_rtp_gcc.GNU index 9f9213bf87b..88cfc0adbb5 100644 --- a/include/makeinclude/platform_qnx_rtp_gcc.GNU +++ b/include/makeinclude/platform_qnx_rtp_gcc.GNU @@ -18,10 +18,13 @@ endif # ! exceptions CC = gcc CXX = g++ + +include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU + DCFLAGS += -gstabs CFLAGS += -pipe -W -Wall -Wpointer-arith -CCFLAGS += $(CFLAGS) -fno-implicit-templates +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU index 6e90fea8e4a..02a19d59d85 100644 --- a/include/makeinclude/platform_sco-nothread.GNU +++ b/include/makeinclude/platform_sco-nothread.GNU @@ -5,8 +5,11 @@ optimize = 1 CC = gcc CXX = g++ + +include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU + CFLAGS += -w -CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) -fno-strict-prototypes DCFLAGS += -g #### should this be -gstabs? DLD = $(CXX) LD = $(CXX) |