diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 14:24:22 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 14:24:22 +0000 |
| commit | 8c82d828e12c8157d960dc6bddb16ff1698bfa15 (patch) | |
| tree | b53f3269938b7d7d43ed28464cbf1376d3bd5971 | |
| parent | 5ddbf9e1d4de613c53f14bd69c62132aaaad05a0 (diff) | |
| download | ATCD-8c82d828e12c8157d960dc6bddb16ff1698bfa15.tar.gz | |
ChangeLogTag: Fri Aug 25 09:22:11 2000 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | include/makeinclude/platform_sunos5_sunc++.GNU | 12 |
4 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index bc68f0a7b2f..053ac773de1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 25 09:22:11 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU + Modified check for SunCC 5 to work with 5.0 and 5.1 (Forte). + Thu Aug 24 09:01:23 2000 JLopez <jlopez@uida.es> * ace/config-tru64.h: #define ACE_LACKS_SYSTIME_H with diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index bc68f0a7b2f..053ac773de1 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Fri Aug 25 09:22:11 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU + Modified check for SunCC 5 to work with 5.0 and 5.1 (Forte). + Thu Aug 24 09:01:23 2000 JLopez <jlopez@uida.es> * ace/config-tru64.h: #define ACE_LACKS_SYSTIME_H with diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index bc68f0a7b2f..053ac773de1 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Fri Aug 25 09:22:11 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU + Modified check for SunCC 5 to work with 5.0 and 5.1 (Forte). + Thu Aug 24 09:01:23 2000 JLopez <jlopez@uida.es> * ace/config-tru64.h: #define ACE_LACKS_SYSTIME_H with diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index eeca189f5d3..72b92af9e1c 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -87,7 +87,7 @@ ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION))) #### Create template repository to avoid compiler warning. TEMPLATE_REPOSITORY = Templates.DB else # ! 4.2 -ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION))) +ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION))) #### CC 5.0 or later #### Inlining appears to cause link problems with early releases of #### CC 5.0. @@ -104,7 +104,13 @@ ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION))) #### 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 + CCFLAGS += $(CFLAGS) -instances=explicit + ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) + CCFLAGS += -library=iostream,no%Cstd + else + #### SunCC 5.1 seems to need the std cpp lib + CCFLAGS += -library=iostream + endif # CC 5.0 endif # compat4 requested endif # CC 5.0 or later endif # ! 4.2 @@ -144,7 +150,7 @@ endif LIBS += -lsocket -ldl -lnsl -lgen -lposix4 endif # orbix -ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION))) +ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION))) ifeq ($(compat4),1) COMPAT_LIBDIR=/opt/SUNWspro/lib/CC4 LIBS += -L$(COMPAT_LIBDIR) -lC |