From a4d2beb16bbfce3df5ff5e2b4201d2cc9eb442ab Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 17 Feb 2012 13:25:14 -0800
Subject: [PATCH] Only modify PATH on win32 when in MSYSTEM shell

---
 mk/platform.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mk/platform.mk b/mk/platform.mk
index 4f77cd1d1178..2312ae9a76ea 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -178,8 +178,13 @@ ifdef CFG_WINDOWSY
   CFG_LIB_NAME=$(1).dll
   CFG_LIB_GLOB=$(1)-*.dll
   CFG_DEF_SUFFIX := .def
+ifdef MSYSTEM
   CFG_LDPATH :=$(CFG_LDPATH):$$PATH
   CFG_RUN=PATH="$(CFG_LDPATH):$(1)" $(2)
+else
+  CFG_LDPATH :=
+  CFG_RUN=$(2)
+endif
   CFG_RUN_TARG=$(call CFG_RUN,$(HLIB$(1)_H_$(CFG_HOST_TRIPLE)),$(2))
   CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1),$(3)),$(1))
   CFG_LIBUV_LINK_FLAGS=-lWs2_32