Kaydet (Commit) 26e7cb5e authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove gb_LinkTarget_add_generated_cxxobjects

...in favor of gb_LinkTarget_add_generated_exception_objects.  The former would
have needed any flags to be passed in explicitly (but no call sites did), so
e.g. StaticLibrary_graphite didn't have any debug information (when building
with --enable-debug).  I guess there is no downside to having C++ exception
support enabled in these places, and using _add_generated_cxxobjects instead was
likely an oversight in the first place (at least in the case of
external/graphite/StaticLibrary_graphite.mk, it was that way ever since
1ceb47d9 "graphite: convert to gbuild", but for
no apparent reason).

Change-Id: I9986a6c5ec30a521095dbe5315e5ca649741a790
üst ed11b38a
...@@ -33,7 +33,7 @@ endif ...@@ -33,7 +33,7 @@ endif
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp)) $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp))
$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,graphite,\ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\
UnpackedTarball/graphite/src/$(if $(filter GCC,$(COM)),direct,call)_machine \ UnpackedTarball/graphite/src/$(if $(filter GCC,$(COM)),direct,call)_machine \
UnpackedTarball/graphite/src/gr_char_info \ UnpackedTarball/graphite/src/gr_char_info \
UnpackedTarball/graphite/src/gr_face \ UnpackedTarball/graphite/src/gr_face \
......
...@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_add_defs,hunspell,\ ...@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_add_defs,hunspell,\
-DOPENOFFICEORG \ -DOPENOFFICEORG \
)) ))
$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,hunspell,\
UnpackedTarball/hunspell/src/hunspell/affentry \ UnpackedTarball/hunspell/src/hunspell/affentry \
UnpackedTarball/hunspell/src/hunspell/affixmgr \ UnpackedTarball/hunspell/src/hunspell/affixmgr \
UnpackedTarball/hunspell/src/hunspell/csutil \ UnpackedTarball/hunspell/src/hunspell/csutil \
......
...@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,mythes,mythes)) ...@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,mythes,mythes))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mythes)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,mythes))
$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,mythes,\ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,mythes,\
UnpackedTarball/mythes/mythes \ UnpackedTarball/mythes/mythes \
)) ))
......
...@@ -107,7 +107,6 @@ $(eval $(foreach method,\ ...@@ -107,7 +107,6 @@ $(eval $(foreach method,\
add_scanners \ add_scanners \
add_exception_objects \ add_exception_objects \
add_generated_cobjects \ add_generated_cobjects \
add_generated_cxxobjects \
add_generated_exception_objects \ add_generated_exception_objects \
add_cflags \ add_cflags \
add_cxxflags \ add_cxxflags \
......
...@@ -182,7 +182,6 @@ $(eval $(foreach method,\ ...@@ -182,7 +182,6 @@ $(eval $(foreach method,\
add_exception_objects \ add_exception_objects \
add_x64_generated_exception_objects \ add_x64_generated_exception_objects \
add_generated_cobjects \ add_generated_cobjects \
add_generated_cxxobjects \
add_generated_exception_objects \ add_generated_exception_objects \
use_library_objects \ use_library_objects \
add_grammar \ add_grammar \
......
...@@ -1346,11 +1346,6 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3), ...@@ -1346,11 +1346,6 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3),
$(foreach obj,$(2),$(eval $(call gb_GenCObject_get_target,$(obj)) : CXXOBJECT_X64 := YES)) $(foreach obj,$(2),$(eval $(call gb_GenCObject_get_target,$(obj)) : CXXOBJECT_X64 := YES))
endef endef
# call gb_LinkTarget_add_generated_cxxobjects,linktarget,sourcefiles,cxxflags,linktargetmakefilename
define gb_LinkTarget_add_generated_cxxobjects
$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3)))
endef
# call gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,linktargetmakefilename,cxxflags # call gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,linktargetmakefilename,cxxflags
define gb_LinkTarget_add_generated_exception_object define gb_LinkTarget_add_generated_exception_object
$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)) $(4)) $(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)) $(4))
......
...@@ -82,7 +82,6 @@ $(eval $(foreach method,\ ...@@ -82,7 +82,6 @@ $(eval $(foreach method,\
add_x64_generated_exception_objects \ add_x64_generated_exception_objects \
add_generated_cobjects \ add_generated_cobjects \
add_x64_generated_cobjects \ add_x64_generated_cobjects \
add_generated_cxxobjects \
add_generated_exception_objects \ add_generated_exception_objects \
add_cflags \ add_cflags \
add_cxxflags \ add_cxxflags \
......
...@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\ ...@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\
vcl/unx/kde/fpicker/kdemodalityfilter \ vcl/unx/kde/fpicker/kdemodalityfilter \
)) ))
$(eval $(call gb_Executable_add_generated_cxxobjects,tdefilepicker,\ $(eval $(call gb_Executable_add_generated_exception_objects,tdefilepicker,\
CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc \ CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment