[Libreoffice-commits] core.git: external/liblangtag

Thorsten Behrens Thorsten.Behrens at CIB.de
Sat Sep 9 22:24:38 UTC 2017


 external/liblangtag/ExternalProject_langtag.mk |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 6edd48993bf345baf973c134d859b50ad13fd18a
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Sat Sep 9 23:27:22 2017 +0200

    liblangtag: pass through debug options to CFLAGS
    
    Change-Id: I08ecf01de2a7f32117dc4a3cac3cd782c0c8f83f
    Reviewed-on: https://gerrit.libreoffice.org/42126
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index d20d7dd7fd85..a6c23b9b5455 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -28,6 +28,11 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 			--enable-shared --disable-static) \
 		$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 		$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
+		CFLAGS='$(CFLAGS) \
+				$(if $(ENABLE_OPTIMIZED), \
+					$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+				$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
+				$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
 		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
 		LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
 		LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \


More information about the Libreoffice-commits mailing list