[Libreoffice-commits] .: config_host.mk.in solenv/gbuild

[Lubos Lunak]

 config_host.mk.in                       |    1 -
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b6526cfa9070c5b9734c92ca20f16b16807b1031
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Jun 4 16:40:51 2012 +0200

    do not export INCLUDE for MSVC, avoids problems long LO build path
    
    INCLUDE is used by MSVC (http://msdn.microsoft.com/en-us/library/kezkeayy.aspx)
    and make somehow (not sure why) exports the INCLUDE that gbuild uses,
    which (again, not sure why) causes MSVC to report a misleading error about
    incorrect argument. There actually does not appear to be any (unreasonably)
    low path length limit on Windows.
    
    Change-Id: I9329eb668f7a710ec69c8b5262b855f346ed01d2

diff --git a/config_host.mk.in b/config_host.mk.in
index ef798eb..fd738fe 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -226,7 +226,6 @@ export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITION
 export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
 export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
 export ILIB=@ILIB@
- at x_Cygwin@ export INCLUDE=
 export INPATH=@INPATH@
 export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTALLDIR=@INSTALLDIR@
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 23ccc7f..5629ee5 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -264,6 +264,7 @@ define gb_CObject__command
 $(call gb_Output_announce,$(2).c,$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
+	unset INCLUDE && \
 	$(gb_CC) \
 		$(DEFS) \
 		$(T_CFLAGS) \
@@ -284,6 +285,7 @@ define gb_CxxObject__command
 $(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
+	unset INCLUDE && \
 	$(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
@@ -337,6 +339,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \
 		$(NATIVERES)) && \
+	unset INCLUDE && \
 	$(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \