summaryrefslogtreecommitdiff
path: root/include/makeinclude
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-06-17 21:21:24 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-06-17 21:21:24 +0000
commit44646e51b6ecb6bdfbb09c14730f3dc4efbe92f2 (patch)
tree67aeda24cc017e1c295872ab802ff048a39a7566 /include/makeinclude
parent34dd39514ba41a61418ee886aa34d20eb7970ce8 (diff)
downloadATCD-44646e51b6ecb6bdfbb09c14730f3dc4efbe92f2.tar.gz
made exception handling optional via "exceptions=1" make flag
Diffstat (limited to 'include/makeinclude')
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU21
1 files changed, 15 insertions, 6 deletions
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 2f0435e50a7..d05f74087d3 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -17,17 +17,26 @@
CC = cc
CXX = CC
CFLAGS += $(DCFLAGS) -mt
-#### Exception handling breaks on MP machines prior to Sun C++ 4.2
-#### with jumbo patch 104631-02, see ace/config-sunos5.5-sunc++-4.x.h.
-#### If you are using a version of Sun C++ prior to 4,2, or haven't
-#### applied that jumbo patch to your 4.2, then add "-noex" to
-#### CCFLAGS below.
#### -pta instantiates all template members, which makes libraries bigger.
#### But, it's supposed to put each member into it's own .o, so executable
#### size should not be penalized.
-CCFLAGS += $(CFLAGS) -pta
+CCFLAGS += $(CFLAGS) $(EXFLAGS) -pta
DCFLAGS += -g
DLD = $(CXX)
+
+#### Exception handling breaks on MP machines prior to Sun C++ 4.2
+#### with jumbo patch 104631-02, see ace/config-sunos5.5-sunc++-4.x.h.
+#### If you are using a version of Sun C++ prior to 4,2, or haven't
+#### applied that jumbo patch to your 4.2, or don't want to pay the
+#### performance penalty of exception handling, then use the default
+#### of no exceptions. If you want to enable exception handling,
+#### add "exceptions=1" to your "make" invocation.
+ifdef exceptions
+EXFLAGS += -DACE_HAS_EXCEPTIONS
+else
+EXFLAGS += -noex
+endif # exceptions
+
LD = $(CXX)
ifdef orbix