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

windows: msbuild gets completely confused when the 'Platform' envvar is set.

Browse Source 
Change-Id: Iea04859c6afa203bd6b527b99c680ff4176cf9e1
This commit is contained in:
Jan Holesovsky
2014-11-16 00:11:38 +01:00
parent e423113497
commit b829f8352c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/gbuild/ExternalProject.mk
View File

@@ -212,6 +212,7 @@ define gb_ExternalProject_run
$(if $(findstring YES,$(UNPACKED_IS_BIN_TARBALL)),\ $(if $(findstring YES,$(UNPACKED_IS_BIN_TARBALL)),\
touch $@, touch $@,
$(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \ $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \
unset Platform && \
$(if $(WRAPPERS),export $(WRAPPERS) &&) \ $(if $(WRAPPERS),export $(WRAPPERS) &&) \
$(if $(NMAKE),INCLUDE="$(gb_ExternalProject_INCLUDE)" LIB="$(ILIB)" MAKEFLAGS=) \ $(if $(NMAKE),INCLUDE="$(gb_ExternalProject_INCLUDE)" LIB="$(ILIB)" MAKEFLAGS=) \
$(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log)) $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log))