diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-07 12:32:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-06-07 12:32:52 +0200 |
| commit | 26e7cb5ef4fa0df985214ef98622255cfdfbdd01 (patch) | |
| tree | b4293745b2dd1b8499e66afe543657c2d714bbda /solenv/gbuild | |
| parent | ed11b38a7efd3dafb9866327aa9c8e9ad1e73045 (diff) | |
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
1ceb47d96da9e7977c96241f49ad291ff0466970 "graphite: convert to gbuild", but for
no apparent reason).
Change-Id: I9986a6c5ec30a521095dbe5315e5ca649741a790
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index afe4ddf51c47..4d0041eb7cf0 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -107,7 +107,6 @@ $(eval $(foreach method,\ add_scanners \ add_exception_objects \ add_generated_cobjects \ - add_generated_cxxobjects \ add_generated_exception_objects \ add_cflags \ add_cxxflags \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 18640d6437d4..9f94b8d6fcad 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -182,7 +182,6 @@ $(eval $(foreach method,\ add_exception_objects \ add_x64_generated_exception_objects \ add_generated_cobjects \ - add_generated_cxxobjects \ add_generated_exception_objects \ use_library_objects \ add_grammar \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 5d192df299cb..4ef1bf954965 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -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)) 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 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)) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 849c0b51a5ad..10f45cd960c9 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -82,7 +82,6 @@ $(eval $(foreach method,\ add_x64_generated_exception_objects \ add_generated_cobjects \ add_x64_generated_cobjects \ - add_generated_cxxobjects \ add_generated_exception_objects \ add_cflags \ add_cxxflags \ |