mirror of
https://github.com/rust-lang/rust.git
synced 2025-01-19 11:12:43 +00:00
Only modify PATH on win32 when in MSYSTEM shell
This commit is contained in:
parent
404c9155f6
commit
a4d2beb16b
@ -178,8 +178,13 @@ ifdef CFG_WINDOWSY
|
|||||||
CFG_LIB_NAME=$(1).dll
|
CFG_LIB_NAME=$(1).dll
|
||||||
CFG_LIB_GLOB=$(1)-*.dll
|
CFG_LIB_GLOB=$(1)-*.dll
|
||||||
CFG_DEF_SUFFIX := .def
|
CFG_DEF_SUFFIX := .def
|
||||||
|
ifdef MSYSTEM
|
||||||
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
|
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
|
||||||
CFG_RUN=PATH="$(CFG_LDPATH):$(1)" $(2)
|
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_TARG=$(call CFG_RUN,$(HLIB$(1)_H_$(CFG_HOST_TRIPLE)),$(2))
|
||||||
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1),$(3)),$(1))
|
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1),$(3)),$(1))
|
||||||
CFG_LIBUV_LINK_FLAGS=-lWs2_32
|
CFG_LIBUV_LINK_FLAGS=-lWs2_32
|
||||||
|
Loading…
Reference in New Issue
Block a user