summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2002-02-26 15:39:05 +0000
committerSteve Huston <shuston@riverace.com>2002-02-26 15:39:05 +0000
commit39d99b24e795b2fcf8efd5cc05be2b4bee4917cd (patch)
tree985274e471b825c6ef40565e4ba696c1a200f816 /include
parentf01574194ab34ae96efd958ba66b21d9a666368c (diff)
downloadATCD-39d99b24e795b2fcf8efd5cc05be2b4bee4917cd.tar.gz
ChangeLogTag:Tue Feb 26 10:22:39 2002 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU22
1 files changed, 12 insertions, 10 deletions
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index eb61c6abbdf..f7ca5a81877 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -113,10 +113,19 @@ else # ! 4.2
#### If compat=4 is desired, set up for that. There are syntactic diffs
#### in the compatibility modes, but here all we need to be concerned with
#### is turning on -compat=4, and not trying to enable the new libraries.
- #### RTTI may work, but has not been tested. To try it, cut/paste the
- #### rtti conditions from the 4.2 section, above.
ifeq ($(compat4),1)
- CCFLAGS += -compat=4 -DACE_LACKS_RTTI -instances=explicit
+ CCFLAGS += -compat=4 -instances=explicit
+
+ #### RTTI can coexist with ACE, but it doesn't use it. To enable,
+ #### add rtti=1 to your make invocation. Sun C++ 4.2, only, supports
+ #### this option.
+ ifeq (1,$(rtti))
+ CCFLAGS += -features=rtti
+ else # ! rtti
+ #### ACE_LACKS_RTTI is necessary with -features=castop, but
+ #### without -features=rtti, to convert dynamic_cast to static_cast.
+ CCFLAGS += -DACE_LACKS_RTTI
+ endif # ! rtti
else
#### Support RTTI by default. And, use explicit template instantiation
#### because automatic instantiation appears to be broken, at least
@@ -173,13 +182,6 @@ ifeq ($(distrib),0)
endif
LIBS += -lsocket -ldl -lnsl -lgen -lposix4
-ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION)))
- ifeq ($(compat4),1)
- COMPAT_LIBDIR=/opt/SUNWspro/lib/CC4
- LIBS += -L$(COMPAT_LIBDIR) -lC
- endif
-endif
-
LDFLAGS += -xildoff
OCFLAGS += -O