diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_g++_common.GNU | 14 | ||||
| -rw-r--r-- | include/makeinclude/platform_sunos5_sunc++.GNU | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU index 89519b85541..0d667cedbc8 100644 --- a/include/makeinclude/platform_g++_common.GNU +++ b/include/makeinclude/platform_g++_common.GNU @@ -9,15 +9,19 @@ CXX_VERSION := $(shell $(CXX) -dumpversion) # ifeq ($(templates),) ifeq (2.95,$(findstring 2.95,$(CXX_VERSION))) - templates = "automatic" + templates = automatic else ifeq (3.,$(findstring 3.,$(CXX_VERSION))) - templates = "automatic" + templates = automatic else ifeq (2.96,$(findstring 2.96,$(CXX_VERSION))) - templates = "automatic" + templates = automatic else - templates = "explicit" + ifeq (egcs, $(findstring egcs, $(CXX_VERSION))) + templates = explicit + else + templates = explicit + endif endif endif endif @@ -25,7 +29,7 @@ endif # Turn on the proper flags for explicit template instantiation. # -ifeq ("$(templates)","explicit") +ifeq ($(templates),explicit) ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. TEMPLATES_FLAG=-fno-implicit-templates endif diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index 2d23627c7ec..51f2a97cfce 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -106,7 +106,6 @@ else # ! 4.2 else # ! 5.1 inline = 1 exceptions = 1 - templates = "automatic" endif # 5.2 or greater endif #! 5.0 @@ -129,9 +128,7 @@ else # ! 4.2 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 - #### with early releases of CC 5.0. And, use old iostreams. + #### Support RTTI by default. And, use old iostreams. ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) ifeq (1,$(stdcpplib)) CCFLAGS += -library=Cstd @@ -163,18 +160,18 @@ endif # ! 4.2 # ifeq ($(templates),) ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION))) - templates = "explicit" + templates = explicit else ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) - templates = "explicit" + templates = explicit else ifeq (C++ 5.1,$(findstring C++ 5.1,$(CC_VERSION))) - templates = "automatic" + templates = explicit else # Assume it's Forte Update 1 or later. Implicit template # instantiation seems to work. # - templates = "automatic" + templates = automatic endif endif endif @@ -182,7 +179,7 @@ endif # Turn on the proper flags for explicit template instantiation. # -ifeq ("$(templates)","explicit") +ifeq ($(templates),explicit) ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. TEMPLATES_FLAG=-instances=explicit endif |