diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-25 11:45:37 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-03-12 14:45:28 +0100 |
| commit | 314d586f023b466eaf280abb19cff5e0e066c127 (patch) | |
| tree | 7c1ed247b07f33c9a4af2bc03bc634fedcb3553e | |
| parent | LOK: added missing PixelInvalidate method for currency list (diff) | |
| download | core-314d586f023b466eaf280abb19cff5e0e066c127.tar.gz core-314d586f023b466eaf280abb19cff5e0e066c127.zip | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 39a05303344b..3dac98fc4362 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 \ $(if $(filter LINUX,$(OS)),-Wl$(COMMA)-z$(COMMA)origin \ |