diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-18 20:47:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-19 09:55:24 +0200 |
| commit | e9528e41b266ad59eb8768fb3aac07e97b4dde14 (patch) | |
| tree | 4a1214249b0745fa046004a7a100ec3a3461846d /external | |
| parent | 8bfa23efcd01b06956186c416d0b3c1ae21a9e77 (diff) | |
augment CFLAGS for libxml2 instead of overwriting
so CFLAGS containing msan's -fsanitize=memory are not discarded
Change-Id: I3a6cdbe88b1aae37a48e73d5ed7ea06e92d78f6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120683
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxml2/ExternalProject_libxml2.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libxml2/ExternalProject_libxml2.mk b/external/libxml2/ExternalProject_libxml2.mk index 6c3e5bb935e4..f3f6654397ab 100644 --- a/external/libxml2/ExternalProject_libxml2.mk +++ b/external/libxml2/ExternalProject_libxml2.mk @@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build): $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \ LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \ - CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g) $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED),-g)" \ + CFLAGS="$(CFLAGS) $(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g) $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED),-g)" \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ ) |