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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c6e778253ef3..b130e1e5ec68 100644 --- a/configure.ac +++ b/configure.ac @@ -5326,7 +5326,6 @@ WORKDIR="${BUILDDIR}/workdir" INSTDIR="${BUILDDIR}/instdir" INSTROOTBASE=${INSTDIR}${INSTROOTBASESUFFIX} INSTROOT=${INSTROOTBASE}${INSTROOTCONTENTSUFFIX} -SOLARINC="-I$SRC_ROOT/include $SOLARINC" AC_SUBST(COM) AC_SUBST(CPUNAME) AC_SUBST(RTL_OS) |