[Libreoffice-commits] core.git: solenv/gbuild

[David Tardon]

 solenv/gbuild/ExternalProject.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b986c5076c0489e690b07e289b67f035b545d04e
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 14 12:10:05 2013 +0100

    cygpath only exists in Windows build, 2nd try
    
    Avoid the $(shell cygpath) calls when not on windows. The error message
    is harmless, but it bothers me. I think gb_ExternalProject_use_autoconf
    (and the AUTOCONF_WRAPPERS definition) should be moved to
    gbuild/platform.
    
    Change-Id: Ia537c5dac682f93ce5efe5c54b97b3a257cb6136

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index ff55c0e..e180014 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -200,12 +200,14 @@ endef
 # default log_filename is <run_target>.log
 #
 
-AUTOCONF_WRAPPERS = \
+ifeq ($(COM),MSC)
+AUTOCONF_WRAPPERS := \
 	REAL_CC="$(shell cygpath -w $(CC))" \
 	CC="$(call gb_Executable_get_target,gcc-wrapper)" \
 	REAL_CXX="$(shell cygpath -w $(CXX))" \
 	CXX="$(call gb_Executable_get_target,g++-wrapper)" \
     LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo"
+endif
 
 define gb_ExternalProject_run
 $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \