diff options
| author | Vincent LE GARREC <libreoffice@le-garrec.fr> | 2021-02-21 11:52:43 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-02-24 19:22:08 +0100 |
| commit | 8ae9d4727d8010a8f5d51f76ff0ebc5f88f0709f (patch) | |
| tree | 68738992839f767f52f0b1e17826a4057f3591a1 | |
| parent | 18e9e6d3dfa36afcc6c287578083948149d5aa4c (diff) | |
Build internal icu with user CFLAGS
I have a Gentoo (Linux) with libxml2 built with icu support.
Under Gentoo, icu is built with U_DISABLE_RENAMING=1.
Building LibreOffice with internal icu uses system libxml2.
So both builds need CFLAGS="U_DISABLE_RENAMING=1" to avoid naming conflicts.
Change-Id: I565c4ac079aee5e48a1e43f21d0a697e3498f925
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111276
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 3ded08562211..4ff8370ebd50 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : else # $(OS) -icu_CFLAGS:=" \ +icu_CFLAGS:="$(CFLAGS) \ $(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include) \ $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ |