diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-11-27 11:44:49 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-28 15:15:24 +0100 |
| commit | 9e06d98c87ee7313c72164d0689d7fad1bc8399f (patch) | |
| tree | 7b1ea6d932beabf5d9a00e460836d61d19fd755b /solenv | |
| parent | 1d1449fee3bff39c4a5f54e3938b414efcabd6b6 (diff) | |
Turns out SdiTarget needs the extended SOLARINC after all
After fbfe55e58c4b14f86cbb2c7b822f727e5b2e4a66 "There appears to be no need for
-I. in SOLARINC", on Windows, e.g. workdir/Dep/SdiTarget/basctl/sdi/basslots.d
now contains basslots.sdi without a path, because the call to
osl::File::searchFileURL in SvIdlParser::ReadInclude (idl/source/prj/parser.cxx)
is done with rBase.GetPath() no longer containing the basctl/sdi/ source dir, so
searchFileURL silently returns "basslots.sdi" unmodified. (The non-Windows
implementation in sal/osl/unx/file_url.cxx appears to also check CWD, so doesn't
suffer from this regression.)
Change-Id: I51802192cfe112f810b193a77d14787d965c2761
Reviewed-on: https://gerrit.libreoffice.org/45323
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 445288f073f3c462669f02f3307ef9009ea0f594)
Reviewed-on: https://gerrit.libreoffice.org/45347
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/SdiTarget.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index d7febb92aced..c76ef691d696 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -63,7 +63,7 @@ $(call gb_SdiTarget_get_clean_target,%) : $(call gb_SdiTarget_get_target,$*)) define gb_SdiTarget_SdiTarget -$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) +$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) -I$$(dir $(SRCDIR)/$(1)) $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi ifeq ($(gb_FULLDEPS),$(true)) -include $(call gb_SdiTarget_get_dep_target,$(1)) |