diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-06 18:04:26 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-06-06 18:04:26 +0000 |
| commit | 40d25e83ee9566df02a1dbfa0164f8ff4bf0240b (patch) | |
| tree | 09a7afcbb2851df2cac389a406a570414a0f7854 /include/makeinclude | |
| parent | d3d5f4ac8b778f6f8ca6f35dc46c3ea7a6f47adc (diff) | |
| download | ATCD-40d25e83ee9566df02a1dbfa0164f8ff4bf0240b.tar.gz | |
Tue Jun 6 12:39:23 2000 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_unixware_g++.GNU | 34 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 6 |
2 files changed, 36 insertions, 4 deletions
diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU index e5e76d03a98..af072940b9a 100644 --- a/include/makeinclude/platform_unixware_g++.GNU +++ b/include/makeinclude/platform_unixware_g++.GNU @@ -2,14 +2,42 @@ # UnixWare V2.2.1.2 with g++ version 2.7.2.2 *not* using Orbix -debug = 1 +#ifndef debug +debug = 0 +#endif + +#ifndef exceptions +exceptions = 1 +#endif + +#ifndef threads +threads = 1 +#endif + CC = gcc CXX = g++ -CFLAGS += -D__STDC__=0 +#CFLAGS += #-frepo -fexternal-templates +#CFLAGS += -D__STDC__=0 +#CCFLAGS += $(CFLAGS) -fno-implicit-templates +#CCFLAGS += $(CFLAGS) #-fexceptions #-fno-implicit-templates or -frepo + + +CFLAGS += -W -Wall -Wpointer-arith -pipe #### -Winline CCFLAGS += $(CFLAGS) -fno-implicit-templates + +ACE_GNUG_ON_UNIXWARE = 1 + +#ifeq ($(exceptions),1) + CCFLAGS += -fexceptions +#endif + DCFLAGS += -g -DLD = $(CXX) +#DCFLAGS += -g + +OCCFLAGS += -O2 + +DLD = $(CXX) -g LD = $(CXX) LIBS += -lsocket -lnsl -lgen -lthread PIC = -fpic diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 6f470a7929b..4b914878933 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -381,7 +381,11 @@ endif # ace_with_x11 ifeq ($(exceptions),) ifeq ($(ACE_HAS_GNUG_PRE_2_8),0) #### Disable the default exception handling of g++ >= 2.8.0. - CCFLAGS += -fno-exceptions -fcheck-new + ifneq ($(ACE_GNUG_ON_UNIXWARE),) + CCFLAGS += -fcheck-new + else + CCFLAGS += -fno-exceptions -fcheck-new + endif # ! ACE_GNUG_ON_UNIXWARE endif # ! ACE_HAS_GNUG_PRE_2_8 else # exceptions CPPFLAGS += -DACE_HAS_EXCEPTIONS |