summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-02-15 20:42:17 +0000
committerolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-02-15 20:42:17 +0000
commit0858e4ba1fbe8b163d082b4eb651318f01310087 (patch)
treec903d623213c223e39a7a9fcd743402d6590dbbf
parent645b17bccaf83fc257af92c9ae5cf4459fbccfe2 (diff)
downloadATCD-0858e4ba1fbe8b163d082b4eb651318f01310087.tar.gz
ChangeLogTag: Tue Feb 15 20:39:49 UTC 2011 Olli Savia <ops@iki.fi>
Diffstat
-rw-r--r--ACE/ChangeLog19
-rw-r--r--ACE/include/makeinclude/platform_aix_g++.GNU2
-rw-r--r--ACE/include/makeinclude/platform_freebsd.GNU2
-rw-r--r--ACE/include/makeinclude/platform_hpux_gcc.GNU2
-rw-r--r--ACE/include/makeinclude/platform_linux.GNU3
-rw-r--r--ACE/include/makeinclude/platform_lynxos.GNU2
-rw-r--r--ACE/include/makeinclude/platform_macosx.GNU2
-rw-r--r--ACE/include/makeinclude/platform_macosx_common.GNU2
-rw-r--r--ACE/include/makeinclude/platform_macosx_panther.GNU2
-rw-r--r--ACE/include/makeinclude/platform_netbsd.GNU3
-rw-r--r--ACE/include/makeinclude/platform_openbsd.GNU2
-rw-r--r--ACE/include/makeinclude/platform_qnx_neutrino.GNU2
-rw-r--r--ACE/include/makeinclude/platform_rtems.x_g++.GNU4
-rw-r--r--ACE/include/makeinclude/platform_vxworks6.2.GNU2
-rw-r--r--ACE/include/makeinclude/platform_vxworks6.3.GNU2
-rw-r--r--ACE/include/makeinclude/platform_win32_interix.GNU2
16 files changed, 34 insertions, 19 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index addcc8370d4..131e9f1b7c6 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,22 @@
+Tue Feb 15 20:39:49 UTC 2011 Olli Savia <ops@iki.fi>
+
+ * include/makeinclude/platform_aix_g++.GNU:
+ * include/makeinclude/platform_freebsd.GNU:
+ * include/makeinclude/platform_hpux_gcc.GNU:
+ * include/makeinclude/platform_linux.GNU:
+ * include/makeinclude/platform_lynxos.GNU:
+ * include/makeinclude/platform_macosx.GNU:
+ * include/makeinclude/platform_macosx_common.GNU:
+ * include/makeinclude/platform_macosx_panther.GNU:
+ * include/makeinclude/platform_netbsd.GNU:
+ * include/makeinclude/platform_openbsd.GNU:
+ * include/makeinclude/platform_qnx_neutrino.GNU:
+ * include/makeinclude/platform_rtems.x_g++.GNU:
+ * include/makeinclude/platform_vxworks6.2.GNU:
+ * include/makeinclude/platform_vxworks6.3.GNU:
+ * include/makeinclude/platform_win32_interix.GNU:
+ Make sure FLAGS_C_CC is added to CCFLAGS.
+
Tue Feb 15 20:20:36 UTC 2011 Olli Savia <ops@iki.fi>
* include/makeinclude/platform_freebsd.GNU:
diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU
index d101c53c7b4..5ace39ebcdf 100644
--- a/ACE/include/makeinclude/platform_aix_g++.GNU
+++ b/ACE/include/makeinclude/platform_aix_g++.GNU
@@ -91,4 +91,4 @@ RANLIB = ranlib
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU
index 70f8a90697a..7e757accd96 100644
--- a/ACE/include/makeinclude/platform_freebsd.GNU
+++ b/ACE/include/makeinclude/platform_freebsd.GNU
@@ -102,4 +102,4 @@ LDFLAGS+=-L/usr/local/lib
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU
index 04cbae62ac2..e405d744de8 100644
--- a/ACE/include/makeinclude/platform_hpux_gcc.GNU
+++ b/ACE/include/makeinclude/platform_hpux_gcc.GNU
@@ -102,4 +102,4 @@ endif
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS) -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC) -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS)
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index 9b8cd00d389..d5ec51cc197 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -1,9 +1,6 @@
# -*- Makefile -*-
# $Id$
-# According to Bryon G. Rigg <bgrigg@opus.bcbnet.com>, this file
-# should allow ACE to be built on Linux.
-
include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU
ifeq ($(insure),0)
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 4dcea393dd4..a5fe19e9a17 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -89,7 +89,7 @@ PRELIB = @true
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
ifeq ($(CXX_MAJOR_VERSION), 3)
LDFLAGS += -L/usr/lib/thread
diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU
index 64de9c56010..fb567484f9a 100644
--- a/ACE/include/makeinclude/platform_macosx.GNU
+++ b/ACE/include/makeinclude/platform_macosx.GNU
@@ -42,4 +42,4 @@ SOBUILD = -o $(VSHDIR)$*.dylib $<
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU
index 49e11107684..d525a79b004 100644
--- a/ACE/include/makeinclude/platform_macosx_common.GNU
+++ b/ACE/include/makeinclude/platform_macosx_common.GNU
@@ -50,7 +50,7 @@ else
endif
LDFLAGS += -flat_namespace
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
ifeq ($(universal),1)
CFLAGS += -arch i386 -arch ppc
diff --git a/ACE/include/makeinclude/platform_macosx_panther.GNU b/ACE/include/makeinclude/platform_macosx_panther.GNU
index bb68229323d..364624a014c 100644
--- a/ACE/include/makeinclude/platform_macosx_panther.GNU
+++ b/ACE/include/makeinclude/platform_macosx_panther.GNU
@@ -31,4 +31,4 @@ SOBUILD = -o $(VSHDIR)$*.dylib $<
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
LDFLAGS += -flat_namespace -undefined warning
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_netbsd.GNU b/ACE/include/makeinclude/platform_netbsd.GNU
index 5ef1afa8df4..2343bf02168 100644
--- a/ACE/include/makeinclude/platform_netbsd.GNU
+++ b/ACE/include/makeinclude/platform_netbsd.GNU
@@ -38,5 +38,4 @@ endif # threads
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
-
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_openbsd.GNU b/ACE/include/makeinclude/platform_openbsd.GNU
index 8ec568f58fb..60169402364 100644
--- a/ACE/include/makeinclude/platform_openbsd.GNU
+++ b/ACE/include/makeinclude/platform_openbsd.GNU
@@ -52,4 +52,4 @@ LDFLAGS+=-L/usr/local/lib
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_qnx_neutrino.GNU b/ACE/include/makeinclude/platform_qnx_neutrino.GNU
index 34d3b4f4464..a4f80030f8c 100644
--- a/ACE/include/makeinclude/platform_qnx_neutrino.GNU
+++ b/ACE/include/makeinclude/platform_qnx_neutrino.GNU
@@ -30,4 +30,4 @@ PRELIB = @true
#
include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
index 12b934018be..bf79d37806a 100644
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
@@ -40,8 +40,7 @@ ifeq (no,$(RTEMS_HAS_NETWORKING))
CCFLAGS += -DACE_LACKS_NETWORKING
endif
-CFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
-CCFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
+CFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
DCFLAGS += -g
DCCFLAGS += -g
DLD = $(LD)
@@ -52,3 +51,4 @@ LDFLAGS += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib
OCFLAGS += -O
PIC =
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU
index bb07b38ecff..ff77b1b63a1 100644
--- a/ACE/include/makeinclude/platform_vxworks6.2.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU
@@ -326,7 +326,7 @@ ifneq ($(optimize),1)
CC_OPTIM_NORMAL =
endif
-CCFLAGS += $(C++FLAGS)
+CCFLAGS += $(C++FLAGS) $(FLAGS_C_CC)
ifeq (0,$(rtp))
PIC =
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 96e51916942..05b3914782f 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -364,7 +364,7 @@ ifneq ($(optimize),1)
CC_OPTIM_NORMAL =
endif
-CCFLAGS += $(C++FLAGS)
+CCFLAGS += $(C++FLAGS) $(FLAGS_C_CC)
ifeq ($(VXWORKSLINK), 1)
diff --git a/ACE/include/makeinclude/platform_win32_interix.GNU b/ACE/include/makeinclude/platform_win32_interix.GNU
index 2970682911f..35ec513517a 100644
--- a/ACE/include/makeinclude/platform_win32_interix.GNU
+++ b/ACE/include/makeinclude/platform_win32_interix.GNU
@@ -42,4 +42,4 @@ PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
#
#include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
-CCFLAGS += $(CFLAGS)
+CCFLAGS += $(CFLAGS) $(FLAGS_C_CC)
View Lorry Controller Status