Kaydet (Commit) 4c404950 authored tarafından David Tardon's avatar David Tardon

ICU_UCHAR_TYPE is not needed for C++11 projects

Change-Id: I089af1a67044ab9cfd767e767a15d1a66014ce2f
Reviewed-on: https://gerrit.libreoffice.org/44178Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 68fb7264
...@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : ...@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-weffc \ --disable-weffc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \ && $(MAKE) \
) )
......
...@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) : ...@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) :
--disable-weffc \ --disable-weffc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) $(ICU_UCHAR_TYPE)" \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \ && $(MAKE) \
) )
......
...@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : ...@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
--disable-werror \ --disable-werror \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \ && $(MAKE) \
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment