summaryrefslogtreecommitdiff
path: root/solenv/gbuild/ExternalProject.mk
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-11-16 00:11:38 +0100
committerJan Holesovsky <kendy@collabora.com>2014-11-18 00:51:03 +0100
commitb829f8352c85593c209ba0f44d83da3a126058a4 (patch)
tree211c092af1cd06ef00d1097538f0736bcc1178b4 /solenv/gbuild/ExternalProject.mk
parente423113497bb0b69f6ed3a390feab174cfbc730c (diff)
windows: msbuild gets completely confused when the 'Platform' envvar is set.
Change-Id: Iea04859c6afa203bd6b527b99c680ff4176cf9e1
Diffstat (limited to 'solenv/gbuild/ExternalProject.mk')
-rw-r--r--solenv/gbuild/ExternalProject.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index aeb53792d7d5..59fc678399a6 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -212,6 +212,7 @@ define gb_ExternalProject_run
$(if $(findstring YES,$(UNPACKED_IS_BIN_TARBALL)),\
touch $@,
$(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \
+ unset Platform && \
$(if $(WRAPPERS),export $(WRAPPERS) &&) \
$(if $(NMAKE),INCLUDE="$(gb_ExternalProject_INCLUDE)" LIB="$(ILIB)" MAKEFLAGS=) \
$(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log))