diff options
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 19 | ||||
| -rw-r--r-- | oox/Library_oox.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 8 | ||||
| -rw-r--r-- | tools/CppunitTest_tools_test.mk | 4 |
4 files changed, 16 insertions, 19 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 0ca679e4b216..f9e573bd7ff2 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -32,10 +32,9 @@ ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_aarch64 bridge_exception_objects := abi callvirtualfunction uno2cpp -$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno, \ +$(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno, \ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/cpp2uno, \ - $(gb_LinkTarget_EXCEPTIONFLAGS) \ - $(call gb_LinkTarget__get_cxxflags,$(gb_CPPU_ENV)_uno) -fstack-protector \ + -fstack-protector \ )) endif @@ -219,8 +218,6 @@ bridges_NON_CALL_EXCEPTIONS_FLAGS := -fnon-call-exceptions endif endif -bridges_DEBUGINFO_FLAGS := $(if $(call gb_LinkTarget__symbols_enabled,Library_$(gb_CPPU_ENV)_uno),$(gb_DEBUGINFO_FLAGS)) - $(eval $(call gb_Library_use_libraries,$(gb_CPPU_ENV)_uno,\ cppu \ sal \ @@ -231,19 +228,19 @@ $(foreach obj,$(bridge_exception_objects),\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \ ) $(foreach obj,$(bridge_noncallexception_objects),\ - $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ + $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \ - , $(bridges_NON_CALL_EXCEPTIONS_FLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(bridges_DEBUGINFO_FLAGS))) \ + , $(bridges_NON_CALL_EXCEPTIONS_FLAGS) )) \ ) $(foreach obj,$(bridge_noopt_objects),\ - $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ + $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(bridges_DEBUGINFO_FLAGS))) \ + , $(gb_COMPILERNOOPTFLAGS))) \ ) $(foreach obj,$(bridge_noncallexception_noopt_objects),\ - $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ + $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \ - , $(gb_COMPILERNOOPTFLAGS) $(bridges_NON_CALL_EXCEPTIONS_FLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(bridges_DEBUGINFO_FLAGS))) \ + , $(gb_COMPILERNOOPTFLAGS) $(bridges_NON_CALL_EXCEPTIONS_FLAGS) )) \ ) $(foreach obj,$(bridge_cxx_objects),\ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index cce41174dcc7..cc235b87e360 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -308,9 +308,9 @@ ifeq ($(OS),iOS) # behaviour in the source code... Compiling this source file with # optimization causes some Smart Art images to end up with completely # wrong colour, some even totally black. -$(eval $(call gb_Library_add_cxxobjects,oox,\ +$(eval $(call gb_Library_add_exception_objects,oox,\ oox/source/drawingml/color \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ + , $(gb_COMPILERNOOPTFLAGS) \ )) else $(eval $(call gb_Library_add_exception_objects,oox,\ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 5abd3c2ba3cf..72c4de1dd206 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1122,7 +1122,7 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2) $(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)) : T_CXXFLAGS += $(3) +$(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(call gb_LinkTarget__get_cxxflags,$(4)) $(3) $(call gb_CxxObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) ifneq ($(gb_ENABLE_PCH),) @@ -1258,7 +1258,7 @@ $(call gb_GenCxxObject_get_target,$(2)) : $(call gb_GenCxxObject_get_source,$(2) $(call gb_GenCxxObject_get_source,$(2),$(1)) : | $(gb_Helper_MISCDUMMY) $(call gb_GenCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) $(call gb_GenCxxObject_get_target,$(2)) : WARNINGS_NOT_ERRORS := $(true) -$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) +$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(call gb_LinkTarget__get_cxxflags,$(4)) $(3) $(call gb_GenCxxObject_get_target,$(2)) : \ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1)) $(call gb_GenCxxObject_get_target,$(2)) : GEN_CXX_SOURCE := $(call gb_GenCxxObject_get_source,$(2),$(1)) @@ -1333,7 +1333,7 @@ endef # call gb_LinkTarget_add_exception_object,linktarget,sourcefile,cxxflags,linktargetmakefilename define gb_LinkTarget_add_exception_object -$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(4)) $(3),$(4)) +$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(3),$(4)) endef # call gb_LinkTarget__use_linktarget_objects,linktarget,linktargets @@ -1418,7 +1418,7 @@ endef # call gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,cxxflags,linktargetmakefilename define gb_LinkTarget_add_generated_exception_object -$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(4)) $(3),$(4)) +$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(3),$(4)) endef # call gb_LinkTarget_add_generated_exception_objects,linktarget,sourcefile,cxxflags,linktargetmakefilename diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 515c3fbd1e14..65f6d02fd782 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -32,8 +32,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \ tools/qa/cppunit/test_GenericTypeSerializer \ )) -$(eval $(call gb_CppunitTest_add_cxxobjects,tools_test,\ - tools/qa/cppunit/test_cpuid, $(gb_LinkTarget_EXCEPTIONFLAGS) $(INTRINSICS_CXXFLAGS) \ +$(eval $(call gb_CppunitTest_add_exception_objects,tools_test,\ + tools/qa/cppunit/test_cpuid, $(INTRINSICS_CXXFLAGS) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,tools_test)) |