diff options
Diffstat (limited to 'external/libpng/StaticLibrary_libpng.mk')
| -rw-r--r-- | external/libpng/StaticLibrary_libpng.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk index 2d56a276f6a7..8abfdec063db 100644 --- a/external/libpng/StaticLibrary_libpng.mk +++ b/external/libpng/StaticLibrary_libpng.mk @@ -44,4 +44,19 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\ ) \ )) +# At least on Linux, with --enable-lto, when building both this external/libpng and external/skia, +# and building with GCC but building skia with Clang (which should be the sole combination that +# matches "CLANG_CC is non-empty"), build this as a fat archive (including both the intermediate GCC +# object code for LTO and machine object code). Besides targets like Library_vcl (which benefit +# from the intermediate GCC object code for LTO), also Library_skia (built with the Clang toolchain +# lld, which does not understand intermediate GCC object code) includes this, so would otherwise +# fail to link (but now does not benefit from LTO for this included StaticLibrary_libpng): +ifeq ($(OS)-$(ENABLE_LTO),LINUX-TRUE) +ifneq ($(filter SKIA,$(BUILD_TYPE)),) +ifneq ($(CLANG_CC),) +$(eval $(call gb_StaticLibrary_add_cflags,libpng,-ffat-lto-objects)) +endif +endif +endif + # vim: set noet sw=4 ts=4: |