[Libreoffice-commits] core.git: external/fontconfig external/freetype

[Caolán McNamara (via logerrit)]

 external/fontconfig/ExternalProject_fontconfig.mk |    2 +-
 external/freetype/ExternalProject_freetype.mk     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09ecc654acfa7d09f701187d9484a36514b70100
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 20 11:40:34 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 20 15:21:38 2021 +0200

    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 at redhat.com>

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)