mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove gb_LinkTarget_add_noexception_object

Browse Source 
Change-Id: I44f7df6e5f816cfcf7a44c6c4c76e80924237d45
Reviewed-on: https://gerrit.libreoffice.org/4955
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Bjoern Michaelsen 2013-07-17 13:28:18 +02:00 committed by Björn Michaelsen
parent 2bf530153e
commit e81b1f23c4
7 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/update_pch.sh
View File

@ -34,7 +34,7 @@ for x in $headers; do
while read line ; do
if test "$line" = "))" ; then
inobjects=
elif echo $line | grep -q -e add_exception_objects -e add_noexception_objects -e add_cxxobject -e add_cxxobjects ; then
elif echo $line | grep -q -e add_exception_objects -e add_cxxobject -e add_cxxobjects ; then
inobjects=1
if test $ifstack -ne 0 ; then
echo Sources in a conditional, ignoring for now. >&2

3
solenv/doc/gbuild/solenv/gbuild/types.mk
View File

@ -111,9 +111,6 @@ namespace gb { namespace types
void add_linked_libs(List<Library> linked_libs);
/// Add libraries to link against statically.
void add_linked_static_libs(List<StaticLibrary> linked_static_libs);
/// Add multiple CxxObject s to be compiled and linked (without exceptions enabled).
/// @deprecated We should not care about disabling exception.
void add_noexception_objects(List<CxxObject> cobject);
/// Set auxiliary files that are produced by linking (for cleanup and copying).
void set_auxtargets(List<Path> auxtargets);
/// Set the location for the produced DLL (used on Windows only).

1
solenv/gbuild/CppunitTest.mk
View File

@ -349,7 +349,6 @@ $(eval $(foreach method,\
use_libraries \
add_linked_static_libs \
use_static_libraries \
add_noexception_objects \
add_objcobject \
add_objcobjects \
add_objcxxobject \

1
solenv/gbuild/Executable.mk
View File

@ -112,7 +112,6 @@ $(eval $(foreach method,\
add_scanner \
add_scanners \
add_exception_objects \
add_noexception_objects \
add_generated_cobjects \
add_generated_cxxobjects \
add_generated_exception_objects \

1
solenv/gbuild/Library.mk
View File

@ -201,7 +201,6 @@ $(eval $(foreach method,\
add_asmobjects \
add_exception_objects \
add_x64_generated_exception_objects \
add_noexception_objects \
add_generated_cobjects \
add_generated_cxxobjects \
add_generated_exception_objects \

13
solenv/gbuild/LinkTarget.mk
View File

@ -1077,15 +1077,6 @@ $(foreach scanner,$(2),$(call gb_LinkTarget_add_scanner,$(1),$(scanner),$(4)))
endef
define gb_LinkTarget_add_noexception_object
$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)))
ifeq ($(gb_ENABLE_PCH),$(true))
# noexception objects are rare, so generate matching .pch only when needed
$(call gb_CxxObject_get_target,$(2)) : $(call gb_NoexPrecompiledHeader_get_timestamp,$(1))
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX) $$(PCHOBJNOEX)
endif
endef
define gb_LinkTarget_add_exception_object
$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)))
endef
@ -1149,10 +1140,6 @@ define gb_LinkTarget_add_asmobjects
$(foreach obj,$(2),$(call gb_LinkTarget_add_asmobject,$(1),$(obj),$(3)))
endef
define gb_LinkTarget_add_noexception_objects
$(foreach obj,$(2),$(call gb_LinkTarget_add_noexception_object,$(1),$(obj),$(4)))
endef
define gb_LinkTarget_add_exception_objects
$(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj),$(4)))
endef

1
solenv/gbuild/StaticLibrary.mk
View File

@ -70,7 +70,6 @@ $(eval $(foreach method,\
add_asmobjects \
add_exception_objects \
add_x64_generated_exception_objects \
add_noexception_objects \
add_generated_cobjects \
add_x64_generated_cobjects \
add_generated_cxxobjects \