From 37f623dded0794dc39adc0ac8d9e9838283b39ac Mon Sep 17 00:00:00 2001 From: levine Date: Tue, 20 Jul 1999 02:19:05 +0000 Subject: ChangeLogTag: Mon Jul 19 21:13:16 1999 Doug Anderson --- include/makeinclude/platform_cray.GNU | 27 ++++++++++++++------------- include/makeinclude/platform_tru64_g++.GNU | 30 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 include/makeinclude/platform_tru64_g++.GNU (limited to 'include/makeinclude') diff --git a/include/makeinclude/platform_cray.GNU b/include/makeinclude/platform_cray.GNU index 026ded4ba07..a36b6fd3c27 100644 --- a/include/makeinclude/platform_cray.GNU +++ b/include/makeinclude/platform_cray.GNU @@ -1,12 +1,13 @@ # $Id$ -# Initial platform macros for SGI/Cray UNICOS (vector) & UNICOS/mk (mpp) - -# UNICOS 10.0.0.2 -# UNICOS/mk 2.0.3.10 -# Cray C++ Version 3.1.0.0 -# Cray Standard C Version 6.1.0.0 +# Platform macros for SGI/Cray UNICOS (vector) & UNICOS/mk (mpp) - +# UNICOS 9.0.2.8 +# UNICOS 10.0.0.5 +# UNICOS/mk 2.0.4.57 +# Cray C++ Version 3.2.0.1 +# Cray Standard C Version 6.2.0.1 # -# Contributed by Doug Anderson +# Contributed by Doug Anderson debug = 1 exceptions = 1 @@ -18,13 +19,13 @@ purify = # C++ prelinker: error: instantiation loop # So, we're using ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION CC = cc -LDLIB += -L$(ACE_ROOT)/ace -CXX = CC -#CFLAGS += -CCFLAGS += -h noautoinstantiate -DCFLAGS += -g -DCCFLAGS += $(DCFLAGS) -OCFLAGS += -O2 +LDLIB += -L$(ACE_ROOT)/ace +CXX = CC +#CFLAGS += +CCFLAGS += -h noautoinstantiate +DCFLAGS += -g +DCCFLAGS += $(DCFLAGS) +OCFLAGS += -O2 OCCFLAGS += $(OCFLAGS) ifndef exceptions diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU new file mode 100644 index 00000000000..ef5fea64d5c --- /dev/null +++ b/include/makeinclude/platform_tru64_g++.GNU @@ -0,0 +1,30 @@ +# $Id$ + +# This platform macros file is intended to work with +# Digital UNIX using the GNU compiler. + +ifndef ACE_DU_VERSION + ACE_DU_VERSION := $(shell uname -r) +endif # ACE_DU_VERSION + +ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION))) + include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU + +else # ! 3.x +ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION))) + include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU + + ifeq (4.0F,$(findstring 4.0F,$(shell /usr/sbin/sizer -v))) + CFLAGS += -DDIGITAL_UNIX=0x40F + else # ! 4.0F + CFLAGS += -DDIGITAL_UNIX=0x400 + endif # ! 4.0F + +else # ! 4.x +ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION))) + include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU + CFLAGS += -DDIGITAL_UNIX=0x500 + +endif # 5.x +endif # ! 4.x +endif # ! 3.x -- cgit v1.2.1