summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>1999-08-16 20:03:18 +0000
committerSteve Huston <shuston@riverace.com>1999-08-16 20:03:18 +0000
commita4c5be2921d1287369b976d26bf404b7cd098c25 (patch)
treeab7b8d4f9978ae09d6de9d81cd7c247a255d2aae
parentd8dfc0ebc57f2e65baf770e1c7a86d82691f8b73 (diff)
downloadATCD-unlabeled-4.51.0.tar.gz
Added support for compat=4 builds.unlabeled-4.51.0
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU23
1 files changed, 18 insertions, 5 deletions
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 166b6a09f1e..42947bfcfdb 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -32,6 +32,9 @@
# size should not be penalized. We don't use it because it's not
# necessary with automatic template instantiation.
+ifeq (,$(compat4))
+ compat4 = 0
+endif
ifeq (,$(debug))
debug = 1
endif
@@ -65,7 +68,7 @@ CC_VERSION = $(shell CC -V 2>&1)
ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
#### CC 4.2, only, supports -features=castop
- CCFLAGS += $(CFLAGS) -features=castop
+ CCFLAGS += $(CFLAGS) -features=castop
#### 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
@@ -86,10 +89,20 @@ ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION)))
#### Inlining appears to cause link problems with early releases of
#### CC 5.0.
inline = 0
- #### Support RTTI by default. And, use explicit template instantiation
- #### because automatic instantiation appears to be broken, at least
- #### with early releases of CC 5.0. And, use old iostreams.
- CCFLAGS += $(CFLAGS) -library=iostream,no%Cstd -instances=explicit
+
+ #### 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 $(CFLAGS) -DACE_LACKS_RTTI -instances=explicit
+ else
+ #### Support RTTI by default. And, use explicit template instantiation
+ #### because automatic instantiation appears to be broken, at least
+ #### with early releases of CC 5.0. And, use old iostreams.
+ CCFLAGS += $(CFLAGS) -library=iostream,no%Cstd -instances=explicit
+ endif # compat4 requested
endif # CC 5.0 or later
endif # ! 4.2