external/cairo/ExternalProject_cairo.mk | 1 + 1 file changed, 1 insertion(+)
New commits: commit c0cc6c39617bd6ea70e96d9a72a2f36deb5ad3c5 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Mar 25 11:45:37 2019 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Mar 25 22:13:03 2019 +0100 cairo configure fails with gold linker with sanitizers enabled Change-Id: I1afbe64fdd8847b0a826be58ee81f218308a0ef5 Reviewed-on: https://gerrit.libreoffice.org/69661 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 6ce6993408cd..da3e59d145a8 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -47,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(filter-out ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \ $(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ LIBS="$(ZLIB_LIBS)" \ + $(if $(filter -fsanitize=%,$(LDFLAGS)),LDFLAGS="$(LDFLAGS) -fuse-ld=bfd") \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
