diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-02-17 13:25:14 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-02-17 23:02:25 -0800 |
| commit | a4d2beb16bbfce3df5ff5e2b4201d2cc9eb442ab (patch) | |
| tree | 258897db7bfd47df9123e2c550d79239bc810220 /mk/platform.mk | |
| parent | 404c9155f6380e119e804f5d2b2dfd6fc193c180 (diff) | |
| download | rust-a4d2beb16bbfce3df5ff5e2b4201d2cc9eb442ab.tar.gz rust-a4d2beb16bbfce3df5ff5e2b4201d2cc9eb442ab.zip | |
Only modify PATH on win32 when in MSYSTEM shell
Diffstat (limited to 'mk/platform.mk')
| -rw-r--r-- | mk/platform.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index 4f77cd1d117..2312ae9a76e 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 |