You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:33:35 UTC
svn commit: r1409556 - in /incubator/ooo/branches/gbuild/main: framework/
idl/ padmin/ sfx2/ solenv/gbuild/ solenv/gbuild/platform/
solenv/gbuild/templates/ toolkit/ tools/
Author: arist
Date: Wed Nov 14 23:33:33 2012
New Revision: 1409556
URL: http://svn.apache.org/viewvc?rev=1409556&view=rev
Log:
gnumake4_059_8801515221cf.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1302528217 0
# Node ID 8801515221cfb7634c0262f30bc80b23635cfba0
# Parent 972105adb559caf6156d9020e378d44dfe5907ad
gnumake4: #i116959#: rename target local variables {C,CXX,OBJCXX}FLAGS:
add a T_ prefix, so we don't need to use override.
Modified:
incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk
incubator/ooo/branches/gbuild/main/idl/Executable_svidl.mk
incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk
incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk
incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk
incubator/ooo/branches/gbuild/main/tools/Executable_mkunroll.mk
incubator/ooo/branches/gbuild/main/tools/Executable_rscdep.mk
incubator/ooo/branches/gbuild/main/tools/Executable_so_checksum.mk
incubator/ooo/branches/gbuild/main/tools/Executable_sspretty.mk
Modified: incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk (original)
+++ incubator/ooo/branches/gbuild/main/framework/Library_fwe.mk Wed Nov 14 23:33:33 2012
@@ -94,8 +94,9 @@ $(eval $(call gb_Library_add_exception_o
))
#todo: ImageListDescriptor can't be exported completely without exporting everything
+# FIXME this should be fixed in m106 => remove this
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
+$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(T_CXXFLAGS))))
endif
ifeq ($(OS),FREEBSD)
$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
Modified: incubator/ooo/branches/gbuild/main/idl/Executable_svidl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/idl/Executable_svidl.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/idl/Executable_svidl.mk (original)
+++ incubator/ooo/branches/gbuild/main/idl/Executable_svidl.mk Wed Nov 14 23:33:33 2012
@@ -39,8 +39,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/idl/inc \
))
-$(eval $(call gb_Executable_set_cxxflags,svidl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,svidl,\
-DIDL_COMPILER \
))
Modified: incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk (original)
+++ incubator/ooo/branches/gbuild/main/padmin/Executable_spadmin.bin.mk Wed Nov 14 23:33:33 2012
@@ -28,10 +28,6 @@ $(eval $(call gb_Executable_set_include,
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
- $$(CXXFLAGS) \
-))
-
$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
vclmain \
))
Modified: incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/Library_qstart.mk Wed Nov 14 23:33:33 2012
@@ -44,8 +44,7 @@ $(eval $(call gb_Library_set_defs,qstart
-DENABLE_QUICKSTART_APPLET \
))
-$(eval $(call gb_Library_set_cflags,qstart_gtk,\
- $$(CFLAGS) \
+$(eval $(call gb_Library_add_cflags,qstart_gtk,\
$(filter-out -I%,$(GTK_CFLAGS)) \
))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk Wed Nov 14 23:33:33 2012
@@ -81,9 +81,13 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_exception_objects \
add_noexception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
set_ldflags \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Executable.mk Wed Nov 14 23:33:33 2012
@@ -68,9 +68,13 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
set_ldflags \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Library.mk Wed Nov 14 23:33:33 2012
@@ -111,9 +111,13 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
set_ldflags \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/LinkTarget.mk Wed Nov 14 23:33:33 2012
@@ -94,8 +94,8 @@ gb_CxxObject__command_dep =
endif
# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
-# are the same as the CXXFLAGS and DEFS we want to use for this object. This
-# should usually be the case. The DEFS/CXXFLAGS would have too be manually
+# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This
+# should usually be the case. The DEFS/T_CXXFLAGS would have too be manually
# overridden for one object file for them to differ. PCH_CXXFLAGS/PCH_DEFS
# should never be overridden on an object -- they should be the same as for the
# whole linktarget. In general it should be cleaner to use a static library
@@ -104,16 +104,16 @@ endif
define gb_CxxObject__set_pchflags
ifeq ($(gb_ENABLE_PCH),$(true))
ifneq ($(strip $$(PCH_NAME)),)
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
else
$$(info No precompiled header available for $$*.)
$$(info precompiled header flags ( ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
-$$(info . object flags : $$(sort $$(CXXFLAGS) $$(DEFS)))
+$$(info . object flags : $$(sort $$(T_CXXFLAGS) $$(DEFS)))
$$@ : PCHFLAGS :=
endif
endif
@@ -221,9 +221,6 @@ gb_ObjCxxObject_ObjCxxObject =
# LinkTarget class
-# need an alias for global CXXFLAGS in gb_LinkTarget_add_exception_object etc.
-gb_CXXFLAGS_TOO := $(CXXFLAGS)
-
gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
# defined by platform
# gb_LinkTarget_CXXFLAGS
@@ -337,12 +334,9 @@ $(call gb_LinkTarget_get_headers_target,
# linktarget. This for example means that you cannot build a single object
# alone, because then you would directly depend on the object.
#
-# A note about flags: here the global variable CFLAGS is overridden by a target
-# local variable of the same name. The $(CFLAGS) on the rhs refers to the
-# global variable. (same thing for OBJCXXFLAGS)
-# CXXFLAGS is slightly different, because it is not set at the link target,
-# but only when using gb_LinkTarget_add_{no,}exception_object etc., to
-# provide a mechanism that disables optimization for a specific file.
+# A note about flags: because the overriding the global variables with a target
+# local variable of the same name is considered obscure, the target local
+# variables have a T_ prefix.
define gb_LinkTarget_LinkTarget
$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1)
@@ -356,12 +350,12 @@ $(call gb_LinkTarget_get_target,$(1)) :
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : override CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : override CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : override OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
$(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -393,10 +387,10 @@ $(call gb_LinkTarget_get_dep_target,$(1)
$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : override OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
@@ -407,6 +401,17 @@ endif
endef
+define gb_LinkTarget_add_defs
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2)
+endif
+endef
+
define gb_LinkTarget_set_defs
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
@@ -420,30 +425,57 @@ endif
endef
+define gb_LinkTarget_add_cflags
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS += $(2)
+endif
+
+endef
+
define gb_LinkTarget_set_cflags
-$(call gb_LinkTarget_get_target,$(1)) : override CFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
endif
endef
+define gb_LinkTarget_add_cxxflags
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
+endif
+endef
+
+# maybe should deprecate this...
define gb_LinkTarget_set_cxxflags
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : override CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : override CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
endif
endef
+define gb_LinkTarget_add_objcxxflags
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS += $(2)
+endif
+endef
+
define gb_LinkTarget_set_objcxxflags
-$(call gb_LinkTarget_get_target,$(1)) : override OBJCXXFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : override OBJCXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
endif
endef
@@ -553,7 +585,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2))
$(call gb_CObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CObject_get_target,$(2)) : override CFLAGS += $(3)
+$(call gb_CObject_get_target,$(2)) : T_CFLAGS += $(3)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
@@ -568,7 +600,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
$(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CxxObject_get_target,$(2)) : override CXXFLAGS += $(3)
+$(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
@@ -583,7 +615,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2))
$(call gb_ObjCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_ObjCxxObject_get_target,$(2)) : override OBJCXXFLAGS += $(3)
+$(call gb_ObjCxxObject_get_target,$(2)) : T_OBJCXXFLAGS += $(3)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
@@ -598,7 +630,7 @@ $(call gb_LinkTarget_get_clean_target,$(
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
$(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_GenCxxObject_get_target,$(2)) : override CXXFLAGS += $(3) $(gb_CXXFLAGS_TOO)
+$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(CXXFLAGS)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
@@ -608,11 +640,11 @@ endif
endef
define gb_LinkTarget_add_noexception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(gb_CXXFLAGS_TOO))
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(CXXFLAGS))
endef
define gb_LinkTarget_add_exception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_CXXFLAGS_TOO))
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(CXXFLAGS))
endef
define gb_LinkTarget_add_cobjects
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/StaticLibrary.mk Wed Nov 14 23:33:33 2012
@@ -86,9 +86,13 @@ $(eval $(foreach method,\
add_exception_objects \
add_noexception_objects \
add_generated_exception_objects \
+ add_cflags \
set_cflags \
+ add_cxxflags \
set_cxxflags \
+ add_objcxxflags \
set_objcxxflags \
+ add_defs \
set_defs \
set_include \
set_ldflags \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/linux.mk Wed Nov 14 23:33:33 2012
@@ -166,7 +166,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CObject_get_target,$(2)) \
@@ -190,7 +191,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/macosx.mk Wed Nov 14 23:33:33 2012
@@ -163,7 +163,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CObject_get_target,$(2)) \
@@ -182,7 +183,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
@@ -200,7 +202,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(OBJCXXFLAGS) \
+ $(DEFS) \
+ $(T_OBJCXXFLAGS) \
-c $(3) \
-o $(1) \
-MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/solaris.mk Wed Nov 14 23:33:33 2012
@@ -155,7 +155,8 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) \
-xMMD \
-xMF $(call gb_CObject_get_dep_target,$(2)) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-I$(dir $(3)) \
$(INCLUDE))
endef
@@ -169,7 +170,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-xMMD \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/windows.mk Wed Nov 14 23:33:33 2012
@@ -278,13 +278,15 @@ $(call gb_Helper_abbreviate_dirs_native,
mkdir -p $(dir $(1)) && \
unset INCLUDE && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) -Fd$(PDBFILE) \
+ $(DEFS) \
+ $(T_CFLAGS) \
+ -Fd$(PDBFILE) \
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
@@ -317,7 +319,9 @@ $(call gb_Helper_abbreviate_dirs_native,
mkdir -p $(dir $(1)) && \
unset INCLUDE && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
+ $(DEFS) \
+ $(T_CXXFLAGS) \
+ -Fd$(PDBFILE) \
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/platform/winmingw.mk Wed Nov 14 23:33:33 2012
@@ -248,12 +248,13 @@ $(call gb_Output_announce,$(2),$(true),C
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
@@ -286,12 +287,13 @@ $(call gb_Output_announce,$(2),$(true),C
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
+$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
endef
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/templates/Executable.mk Wed Nov 14 23:33:33 2012
@@ -27,9 +27,9 @@ $(eval $(call gb_Executable_set_include,
$$(INCLUDE) \
))
-$(eval $(call gb_Executable_set_cxxflags,EXEC,\
- $$(CXXFLAGS) \
-))
+#$(eval $(call gb_Executable_add_defs,EXEC,\
+# -Dfoo \
+#))
$(eval $(call gb_Executable_add_linked_libs,EXEC,\
$(gb_STDLIBS) \
Modified: incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk (original)
+++ incubator/ooo/branches/gbuild/main/toolkit/Library_tk.mk Wed Nov 14 23:33:33 2012
@@ -160,8 +160,9 @@ $(eval $(call gb_Library_add_exception_o
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
- $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+$(eval $(call gb_Library_add_cxxflags,tk,\
+ $(gb_OBJCXXFLAGS) \
+))
endif
ifeq ($(OS),LINUX)
Modified: incubator/ooo/branches/gbuild/main/tools/Executable_mkunroll.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/Executable_mkunroll.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/Executable_mkunroll.mk (original)
+++ incubator/ooo/branches/gbuild/main/tools/Executable_mkunroll.mk Wed Nov 14 23:33:33 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,mkunroll,\
-D_TOOLS_STRINGLIST \
))
Modified: incubator/ooo/branches/gbuild/main/tools/Executable_rscdep.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/Executable_rscdep.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/Executable_rscdep.mk (original)
+++ incubator/ooo/branches/gbuild/main/tools/Executable_rscdep.mk Wed Nov 14 23:33:33 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,rscdep,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,rscdep,\
-D_TOOLS_STRINGLIST \
))
Modified: incubator/ooo/branches/gbuild/main/tools/Executable_so_checksum.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/Executable_so_checksum.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/Executable_so_checksum.mk (original)
+++ incubator/ooo/branches/gbuild/main/tools/Executable_so_checksum.mk Wed Nov 14 23:33:33 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,so_checksum,\
-D_TOOLS_STRINGLIST \
))
Modified: incubator/ooo/branches/gbuild/main/tools/Executable_sspretty.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/tools/Executable_sspretty.mk?rev=1409556&r1=1409555&r2=1409556&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/tools/Executable_sspretty.mk (original)
+++ incubator/ooo/branches/gbuild/main/tools/Executable_sspretty.mk Wed Nov 14 23:33:33 2012
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,sspretty,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,sspretty,\
-D_TOOLS_STRINGLIST \
))