diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-03 11:54:28 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-10-04 08:57:29 +0200 |
| commit | dc34ab8105d9a3a0766a1cbd09b2eeb36fa8f2d2 (patch) | |
| tree | a332d6bfb7c0bd1ee04f63dcc2cdd0271ac57c98 /oox | |
| parent | d1a34deaa87225c5fb7972a93534cfd23a3f6439 (diff) | |
always use gb_LinkTarget__get_cxxflags for cxxobjects
E.g. gb_LinkTarget_add_exception_object adds it explicitly, but
gb_LinkTarget_add_cxxobject itself does not, even though other variants
(c,objc,objcxx) do it.
This means that when compiling tools/qa/cppunit/test_cpuid.cxx it
doesn't get the correct -O/-g flags, because CppunitTest_tools_test.mk
uses gb_CppunitTest_add_cxxobjects to add $(INTRINSICS_CXXFLAGS).
And that in its own actually should use the add_exception_objects variant,
it didn't presumably because that one used to have cxxflags passing broken
until I fixed it in 4bbdab901eb3c7d32d28910fb830f4b0422eee91. The usage
in Library_cpp_uno.mk even explicitly works around the lack of debug symbols.
Change-Id: Idc794e95bb817cd2ba2942b8e1f04f80d6722f97
Reviewed-on: https://gerrit.libreoffice.org/80119
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/Library_oox.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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,\ |