diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-08-11 19:14:13 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-08-11 19:14:13 +0000 |
| commit | 6bda5caac79dafee8eb5000b805f24045ad5d02a (patch) | |
| tree | 7a37eb040cddcc0bc203216cc2c93a726cc9ea96 /include/makeinclude | |
| parent | a1e1e444ae5e141dfe4db033666e0e116bad3f6d (diff) | |
| download | ATCD-6bda5caac79dafee8eb5000b805f24045ad5d02a.tar.gz | |
ChangeLogTag: Thu Aug 11 14:13:22 2005 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_sunos5_sunc++.GNU | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index a01da30b283..c7b291061cc 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -67,8 +67,12 @@ CXX = CC CC_VERSION = $(shell $(CXX) -V 2>&1) -ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) -PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 +ifeq (C++ 5.6,$(findstring C++ 5.6,$(CC_VERSION))) + PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 +else + ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) + PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 + endif endif #### The following macro overrides enable creation of fast executables. @@ -215,6 +219,13 @@ CPPFLAGS += -DSUN_CC_HAS_PVFC_BUG #### add "exceptions=1" to your "make" invocation. ifeq (0,$(exceptions)) CCFLAGS += -noex + ifeq (C++ 5.6,$(findstring C++ 5.6,$(CC_VERSION))) + override stlport = 1 + else + ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) + override stlport = 1 + endif + endif endif # ! exceptions LD = $(CXX) |