diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-20 11:40:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-20 15:21:38 +0200 |
| commit | 09ecc654acfa7d09f701187d9484a36514b70100 (patch) | |
| tree | 450f22bebdec4b979aec3e6c67bc854dacf9fb7a | |
| parent | 01408f9da879f69adbfee515efb4d8a57af2460e (diff) | |
augment CFLAGS for fontconfig and freetype instead of overwriting
so CFLAGS containing msan's -fsanitize=memory are not discarded
Change-Id: Ie213488b5e1e6e5f5aad649f2cf72a12acae9cc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120780
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/fontconfig/ExternalProject_fontconfig.mk | 2 | ||||
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index fdcb80a38363..1d65173ce0f5 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\ $(call gb_ExternalProject_get_state_target,fontconfig,build) : $(call gb_Trace_StartRange,fontconfig,EXTERNAL) $(call gb_ExternalProject_run,build,\ - CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) $(if $(filter EMSCRIPTEN,$(OS)),-pthread)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \ + CFLAGS="$(CFLAGS) $(if $(debug),-g) $(gb_VISIBILITY_FLAGS) $(if $(filter EMSCRIPTEN,$(OS)),-pthread)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \ $(gb_RUN_CONFIGURE) ./configure \ --disable-shared \ --disable-silent-rules \ diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index c4d55960c6ca..8ad6918146bb 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : --without-harfbuzz \ --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ + CFLAGS="$(CFLAGS) $(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ && $(MAKE) install \ && touch $@ ) $(call gb_Trace_EndRange,freetype,EXTERNAL) |