diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-09-01 11:08:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-09-01 16:33:32 +0200 |
| commit | fdedc464535ea37f561b641beb4333b757ef9ecc (patch) | |
| tree | 0d0aecc06f01279e921a7bf3b44d02692fb24957 /external | |
| parent | 7faa086071afe2638d371818d90cecc820e602ef (diff) | |
augment CFLAGS for cairo instead of overwriting
so CFLAGS containing msan's -fsanitize=memory are not discarded
Change-Id: Ib46d060b7542bc3e1b19cdef84ae3f8ea7099b14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121440
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index b1e29d77b043..d7e5579d4107 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(debug),STRIP=" ") \ $(if $(filter ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \ $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS=" $(ZLIB_CFLAGS)" --enable-pthread=yes PTHREAD_LIBS="") \ - $(if $(filter-out EMSCRIPTEN ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \ + $(if $(filter-out EMSCRIPTEN ANDROID iOS,$(OS)),CFLAGS="$(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") \ |