diff options
| author | bors <bors@rust-lang.org> | 2014-11-10 23:01:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-10 23:01:57 +0000 |
| commit | 40fb87d40f681f5356af42175fc7b85da387f037 (patch) | |
| tree | 2ce04247639267c0170cb102bb1a03781773697a | |
| parent | f89e975685a3a9f258c996865cdd144a0f30f83c (diff) | |
| parent | 7c36336c6f94d49bdfdf5cbf0c09e353c79534a4 (diff) | |
| download | rust-40fb87d40f681f5356af42175fc7b85da387f037.tar.gz rust-40fb87d40f681f5356af42175fc7b85da387f037.zip | |
auto merge of #18857 : brson/rust/winescapefixes, r=alexcrichton
| -rw-r--r-- | mk/dist.mk | 2 | ||||
| -rw-r--r-- | mk/main.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 30599b0217d..718b5bf6df6 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -125,7 +125,7 @@ $(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \ dist-prepare-win $(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win $(CFG_BUILD) @$(call E, ISCC: $@) - $(Q)"$(CFG_ISCC)" $< + $(Q)$(CFG_ISCC) $< $(eval $(call DEF_PREPARE,win)) diff --git a/mk/main.mk b/mk/main.mk index aba02088eab..3df4d3bfa5e 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -52,7 +52,7 @@ CFG_GIT_DIR := $(CFG_SRC_DIR).git # so we use a hack: define $(SPACE) which contains space character. SPACE := SPACE += -ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),) +ifneq ($(CFG_GIT),) ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),) CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci') CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD) |