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

David Tardon dtardon at redhat.com
Fri Apr 22 12:55:51 UTC 2016


 external/lcms2/ExternalProject_lcms2.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 334599030e7b45153107a3075f9049a7463aac80
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 22 14:54:57 2016 +0200

    pass original CFLAGS
    
    Change-Id: I1a2e9d41226822934b64ad31a61c816b3163a9ed

diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index 981c1e6..fec0c36 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
 			CPPFLAGS=" $(SOLARINC)" \
-			CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \
+			CFLAGS='$(CFLAGS) $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \
 			$(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \
 			$(if $(DISABLE_DYNLOADING), \
 				--enable-static --disable-shared \


More information about the Libreoffice-commits mailing list