diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-10-09 16:25:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-10-11 14:26:58 +0200 |
| commit | fbfe55e58c4b14f86cbb2c7b822f727e5b2e4a66 (patch) | |
| tree | 0740a3a37b6aaa1fc96952db796fc626a438cea0 /solenv | |
| parent | 948c9c0a313d932d22cf275792077862eb4de334 (diff) | |
There appears to be no need for -I. in SOLARINC
See the mail sub-thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-October/078609.html>
"Re: C[++]: Normalizing include syntax ("" vs <>)".
Change-Id: Ibb636be643789d455e771fcd54913dd3cdd03815
Reviewed-on: https://gerrit.libreoffice.org/43284
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/SdiTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 3e64fda43fd7..d7febb92aced 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 := $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC)) +$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi ifeq ($(gb_FULLDEPS),$(true)) -include $(call gb_SdiTarget_get_dep_target,$(1)) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 977aa0c1eac1..11b7871a3e6f 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -193,7 +193,7 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) gb_LinkTarget_INCLUDE :=\ - $(subst -I. , ,$(SOLARINC)) \ + $(SOLARINC) \ -I$(BUILDDIR)/config_$(gb_Side) \ ifeq ($(COM_IS_CLANG),TRUE) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 08f1fa28fd98..cb4bc73b88ac 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -109,7 +109,7 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) gb_LinkTarget_CXXCLRFLAGS := $(gb_CXXCLRFLAGS) gb_LinkTarget_INCLUDE :=\ - $(subst -I. , ,$(SOLARINC)) \ + $(SOLARINC) \ $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \ -I$(BUILDDIR)/config_$(gb_Side) \ @@ -530,7 +530,7 @@ gb_AUTOCONF_WRAPPERS = \ LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo" gb_ExternalProject_INCLUDE := \ - $(subst -I,,$(subst $(WHITESPACE),;,$(subst -I. , ,$(SOLARINC)))) + $(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC))) # InstallScript class |