diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-01-19 14:32:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-01-19 19:22:09 +0100 |
| commit | 7e101d967328610de3d37b83ca68aca708e4ac48 (patch) | |
| tree | 100300e6aa45ebfe21dbac680fed48f1387da406 /external | |
| parent | 4dedeb5bd3f59e5fc912dc11ed1fecef0bb80660 (diff) | |
Decouple SRCDIR/include from SOLARINC
...turning the latter into "whatever include directories are needed for the
given toolchain and platform, outside the scope of LibreOffice". This is a
prerequisite for fixing <https://gerrit.libreoffice.org/c/core/+/128591/1> "Let
CppunitTest_odk_checkapi build against the SDK include directory", which failed
to find the C++ standard library headers (available via SOLARINC) on Windows.
(In external/icu/ExternalProject_icu.mk, SRCDIR/include is needed for ANDROID to
find <android/compatibility.hxx> in external/icu/icu4c-android.patch.1.)
Change-Id: I960e31140b0839b2b6184a78d935042c3c558d5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128615
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -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 18a8f3838834..d9d6c4b81700 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -52,7 +52,7 @@ icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \ $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ $(if $(call gb_Module__symbols_enabled,icu),$(gb_DEBUGINFO_FLAGS)) \ $(if $(filter FUZZERS,$(BUILD_TYPE)),-DU_USE_STRTOD_L=0) \ - $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer $(SOLARINC))" + $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer -I$(SRCDIR)/include)" icu_LDFLAGS:=" \ $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ $(if $(filter TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style=$(WITH_LINKER_HASH_STYLE)) \ |