mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

There appears to be no need for -I. in SOLARINC

Browse Source 
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>
This commit is contained in:
Stephan Bergmann
2017-10-09 16:25:27 +02:00
parent 948c9c0a31
commit fbfe55e58c
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -4296,7 +4296,7 @@ WORKDIR="${BUILDDIR}/workdir"
INSTDIR="${BUILDDIR}/instdir" INSTDIR="${BUILDDIR}/instdir"
INSTROOTBASE=${INSTDIR}${INSTROOTBASESUFFIX} INSTROOTBASE=${INSTDIR}${INSTROOTBASESUFFIX}
INSTROOT=${INSTROOTBASE}${INSTROOTCONTENTSUFFIX} INSTROOT=${INSTROOTBASE}${INSTROOTCONTENTSUFFIX}
SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC" SOLARINC="-I$SRC_ROOT/include $SOLARINC"
AC_SUBST(COM) AC_SUBST(COM)
AC_SUBST(CPUNAME) AC_SUBST(CPUNAME)
AC_SUBST(RTL_OS) AC_SUBST(RTL_OS)

2
solenv/gbuild/SdiTarget.mk
View File

@@ -63,7 +63,7 @@ $(call gb_SdiTarget_get_clean_target,%) :
$(call gb_SdiTarget_get_target,$*)) $(call gb_SdiTarget_get_target,$*))
define gb_SdiTarget_SdiTarget 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 $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
ifeq ($(gb_FULLDEPS),$(true)) ifeq ($(gb_FULLDEPS),$(true))
-include $(call gb_SdiTarget_get_dep_target,$(1)) -include $(call gb_SdiTarget_get_dep_target,$(1))

2
solenv/gbuild/platform/com_GCC_defs.mk
View File

@@ -193,7 +193,7 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)
gb_LinkTarget_INCLUDE :=\ gb_LinkTarget_INCLUDE :=\
$(subst -I. , ,$(SOLARINC)) \ $(SOLARINC) \
-I$(BUILDDIR)/config_$(gb_Side) \ -I$(BUILDDIR)/config_$(gb_Side) \
ifeq ($(COM_IS_CLANG),TRUE) ifeq ($(COM_IS_CLANG),TRUE)

4
solenv/gbuild/platform/com_MSC_class.mk
View File

@@ -109,7 +109,7 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS)
gb_LinkTarget_CXXCLRFLAGS := $(gb_CXXCLRFLAGS) gb_LinkTarget_CXXCLRFLAGS := $(gb_CXXCLRFLAGS)
gb_LinkTarget_INCLUDE :=\ gb_LinkTarget_INCLUDE :=\
$(subst -I. , ,$(SOLARINC)) \ $(SOLARINC) \
$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \ $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
-I$(BUILDDIR)/config_$(gb_Side) \ -I$(BUILDDIR)/config_$(gb_Side) \
@@ -530,7 +530,7 @@ gb_AUTOCONF_WRAPPERS = \
LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo" LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo"
gb_ExternalProject_INCLUDE := \ gb_ExternalProject_INCLUDE := \
$(subst -I,,$(subst $(WHITESPACE),;,$(subst -I. , ,$(SOLARINC)))) $(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC)))
# InstallScript class # InstallScript class