diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-03 12:29:18 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-10-04 08:57:40 +0200 |
| commit | f87c4e1c2458177c75b12f8ff59d214afcc71c47 (patch) | |
| tree | 0eaa53ec5342d345dddb5fbb6b2d8bb6cdd9c3ce /solenv/gbuild/extensions | |
| parent | dc34ab8105d9a3a0766a1cbd09b2eeb36fa8f2d2 (diff) | |
do not abort build on PCH CXXFLAGS mismatch if set explicitly
All the various gb_CppunitTest_add_cxxobjects variants actually
allow passing additional CXXFLAGS. However, currently that would
abort the build if PCH is used, because PCH requires the same
CXXFLAGS. But if those extra CXXFLAGS are set explicitly, just
skip using the PCH for that one file, as the mismatch is intentional.
Change-Id: Iec4eed6d5f94c3e97ee461241203a84d21e8113c
Reviewed-on: https://gerrit.libreoffice.org/80120
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index a14f6a9145e3..7f05392e1179 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -103,7 +103,7 @@ define gb_LinkTarget_add_cobject $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2) endef -define gb_LinkTarget_add_cxxobject +define gb_LinkTarget_add_cxxobject_internal $(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2) endef @@ -111,7 +111,7 @@ define gb_LinkTarget_add_generated_c_object $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2) endef -define gb_LinkTarget_add_generated_cxx_object +define gb_LinkTarget_add_generated_cxx_object_internal $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) endef |