diff options
| author | David Tardon <dtardon@redhat.com> | 2017-11-01 19:23:37 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-11-02 10:18:35 +0100 |
| commit | 4c404950225e07ec7ee5275657a3192a5af79a04 (patch) | |
| tree | f9ca5d2c3c5a0bc89368a4be0489bc8d4efffc3e | |
| parent | 68fb7264e11cb891605fdf5037a879f7e310b109 (diff) | |
ICU_UCHAR_TYPE is not needed for C++11 projects
Change-Id: I089af1a67044ab9cfd767e767a15d1a66014ce2f
Reviewed-on: https://gerrit.libreoffice.org/44178
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | external/libcdr/ExternalProject_libcdr.mk | 2 | ||||
| -rw-r--r-- | external/libfreehand/ExternalProject_libfreehand.mk | 2 | ||||
| -rw-r--r-- | external/libvisio/ExternalProject_libvisio.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index f23bc50e8b04..c82579937e1e 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --disable-weffc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ 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)) \ && $(MAKE) \ ) diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 19d3f0e3afd9..095ba47d6719 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) : --disable-weffc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ 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)) \ && $(MAKE) \ ) diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index 53a87d1c0025..668e30190988 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ 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)) \ && $(MAKE) \ ) |