solenv/gbuild/SdiTarget.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 445288f073f3c462669f02f3307ef9009ea0f594
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 27 11:44:49 2017 +0100
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.kagan...@collabora.com>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
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))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
