Thu Apr 3 14:13:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 62 insertions, 30 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 107b3bbcd7b..669374d8824 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr  3 14:13:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks5.5.x.GNU:
+        * include/makeinclude/platform_vxworks6.2.GNU:
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          Changed the make variable from which we zap the -ansi and also support
+          this with the diab compiler
+
 Thu Apr  3 09:40:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
 
         * apps/JAWS/stress_testing/benchd.cpp:
diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
index de35dabe87f..6aa3c3d38aa 100644
--- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
+++ b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU
@@ -156,6 +156,24 @@ include $(TARGET_DIR)/make/defs.$(WIND_HOST_TYPE)
 include $(TARGET_DIR)/make/defs.$(PRJ_TYPE)
 include $(TARGET_DIR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
 
+no_cflags_ansi ?= 0
+ifeq ($(no_cflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    CC_COMPILER := $(filter-out -ansi, $(CC_COMPILER))
+  else
+    CC_COMPILER := $(filter-out -Xansi, $(CC_COMPILER))
+  endif
+endif
+
+no_ccflags_ansi ?= 0
+ifeq ($(no_ccflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    C++_COMPILER := $(filter-out -ansi, $(C++_COMPILER))
+  else
+    C++_COMPILER := $(filter-out -Xansi, $(C++_COMPILER))
+  endif
+endif
+
 ## make sure we don't use that stupid, crippled vxrm.bat script.
 override RM=rm -f
 
@@ -278,16 +296,6 @@ CCFLAGS         += $(C++FLAGS)
 
 PIC              =
 
-no_cflags_ansi ?= 0
-ifeq ($(no_cflags_ansi), 1)
-  CFLAGS := $(filter-out -ansi, $(CFLAGS))
-endif
-
-no_ccflags_ansi ?= 0
-ifeq ($(no_ccflags_ansi), 1)
-  CCFLAGS := $(filter-out -ansi, $(CCFLAGS))
-endif
-
 ifeq ($(VXWORKSLINK),1)
 
   ifdef repo
diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU
index f0d9bd1be93..f5198739418 100644
--- a/ACE/include/makeinclude/platform_vxworks6.2.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU
@@ -202,6 +202,24 @@ else
   include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL)
 endif
 
+no_cflags_ansi ?= 0
+ifeq ($(no_cflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    CC_COMPILER := $(filter-out -ansi, $(CC_COMPILER))
+  else
+    CC_COMPILER := $(filter-out -Xansi, $(CC_COMPILER))
+  endif
+endif
+
+no_ccflags_ansi ?= 0
+ifeq ($(no_ccflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    C++_COMPILER := $(filter-out -ansi, $(C++_COMPILER))
+  else
+    C++_COMPILER := $(filter-out -Xansi, $(C++_COMPILER))
+  endif
+endif
+
 ifeq ($(VXWORKSLINK),1)
   # prevent possible clash with static LIB rules
   # in VxWorks make includes and rules.lib.GNU
@@ -326,16 +344,6 @@ else
 endif
 endif
 
-no_cflags_ansi ?= 0
-ifeq ($(no_cflags_ansi), 1)
-  CFLAGS := $(filter-out -ansi, $(CFLAGS))
-endif
-
-no_ccflags_ansi ?= 0
-ifeq ($(no_ccflags_ansi), 1)
-  CCFLAGS := $(filter-out -ansi, $(CCFLAGS))
-endif
-
 ifeq ($(VXWORKSLINK),1)
 
   ifeq ($(repo),1)
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 037445d6d2a..ad5dee27aeb 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -232,6 +232,24 @@ else
 endif
 endif
 
+no_cflags_ansi ?= 0
+ifeq ($(no_cflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    CC_COMPILER := $(filter-out -ansi, $(CC_COMPILER))
+  else
+    CC_COMPILER := $(filter-out -Xansi, $(CC_COMPILER))
+  endif
+endif
+
+no_ccflags_ansi ?= 0
+ifeq ($(no_ccflags_ansi), 1)
+  ifeq ("$(TOOL_FAMILY)","gnu")
+    C++_COMPILER := $(filter-out -ansi, $(C++_COMPILER))
+  else
+    C++_COMPILER := $(filter-out -Xansi, $(C++_COMPILER))
+  endif
+endif
+
 ifeq ($(footprint),1)
   LD_PARTIALFLAGS += -Xlinker -M -Xlinker -Map -Xlinker $@.map
 endif
@@ -359,16 +377,6 @@ endif
 
 CCFLAGS         += $(C++FLAGS)
 
-no_cflags_ansi ?= 0
-ifeq ($(no_cflags_ansi), 1)
-  CFLAGS := $(filter-out -ansi, $(CFLAGS))
-endif
-
-no_ccflags_ansi ?= 0
-ifeq ($(no_ccflags_ansi), 1)
-  CCFLAGS := $(filter-out -ansi, $(CCFLAGS))
-endif
-
 ifeq ($(VXWORKSLINK), 1)
 
   ifeq ($(repo),1)