diff options
Diffstat (limited to 'include/makeinclude/platform_osf1_4.0.GNU')
| -rw-r--r-- | include/makeinclude/platform_osf1_4.0.GNU | 45 |
1 files changed, 14 insertions, 31 deletions
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU index 51cef29f007..0bef1ac4e2b 100644 --- a/include/makeinclude/platform_osf1_4.0.GNU +++ b/include/makeinclude/platform_osf1_4.0.GNU @@ -13,42 +13,21 @@ CXX = $(CC) #### instead, change "-pthread" to "-threads". CFLAGS += -pthread -ifndef CXX_VERSION - CXX_VERSION := $(shell $(CXX) -V) -endif # ! CXX_VERSION - -CXX_1016 = -CXX_1136 = - -ifneq (,$(optimize)) - CXX_1016 = ,1016 -endif # optimize - -#### 6.1-029 and later support msg 1136. We disable it by default. -ifneq (6.0-,$(findstring 6.0-,$(CXX_VERSION))) -ifeq (6.1-,$(findstring 6.1-,$(CXX_VERSION))) - ifeq (6.1-029,$(findstring 6.1-029,$(CXX_VERSION))) - CXX_1136 = ,1136 - endif # 6.1-029 -else # 6.2 or later - CXX_1136 = ,1136 -endif # 6.2 or later -endif # ! 6.0 - #### These flags can only be used with cxx Version 6.0 and later. #### They are enabled by default; they can be disabled by settting #### CXX_VER to CXX_5 either on the make command line, or by #### or by setting the CXX_VER environment variable to CXX_5. -# WARNING_FLAGS += -# 193: zero used for undefined preprocessing identifier -# 236: controlling expression is constant -# 401: base_class_with_nonvirtual_dtor -# 835: unreferenced_function_param -# 1016: expected type is incompatible with declared type of int (in bzero ()) -# 1136: conversion to integral type of smaller size could lose data ifneq ($(CXX_VER),CXX_5) - WARNING_FLAGS += -w0 -msg_display_number -msg_display_tag - WARNING_FLAGS += -msg_disable 193,236,401,835$(CXX_1016)$(CXX_1136) + WARNING_FLAGS += -w0 + ifneq (,$(VERBOSE_WARNING)) + WARNING_FLAGS += -msg_display_number -msg_display_tag + endif # VERBOSE_WARNING + + ifneq (,$(optimize)) + #### See ace/config-osf1-4.0.h for the meaning of this warning. + #### It's not necessary on DU 5.0. + WARNING_FLAGS += -msg_disable 1016 + endif # optimize ifndef ACE_DU_VERSION # In case this file wasn't included by platform_osf1_cxx.GNU: @@ -84,6 +63,10 @@ ifndef exceptions #### Disable the default exception handling of cxx >= 6.0. #### This is untested. exceptions=1 is the default, so it's not used #### by default. + ifndef CXX_VERSION + CXX_VERSION := $(shell $(CXX) -V) + endif # ! CXX_VERSION + ifeq (6.,$(findstring 6.,$(CXX_VERSION))) CCFLAGS += -nocleanup endif # 6.x |