diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-06-04 16:40:51 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-06-04 16:55:29 +0200 |
| commit | b6526cfa9070c5b9734c92ca20f16b16807b1031 (patch) | |
| tree | f513d830a0853f25b0a56e0267e905b6f957979d /solenv | |
| parent | 646c6681f5f9bf1727694fdbba67771b99ae95a4 (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 23ccc7f919be..5629ee51d358 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)) \ |