---

yaml
---
r: 7551
b: refs/heads/master
c: fcd52f5
h: refs/heads/master
i:
  7549: 0c83700
  7547: d2162e4
  7543: 33acad4
  7535: 3beea15
  7519: 686bcea
  7487: 6a5799c
  7423: 0a27d2c
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4700182408154f8e37e31f7f65115def634d118
+refs/heads/master: fcd52f5714ac191767dd89861f70c403444aad82

trunk/mk/dist.mk

@@ -40,10 +40,13 @@ lic.txt: $(S)LICENSE.txt
 	@$(call E, crlf: $@)
 	@$(Q)perl -pe 's@\r\n|\n@\r\n@go' <$< >$@
 
+ifdef CFG_MAKENSIS
 $(PKG_EXE): all rustc-stage3 $(PKG_NSI) $(PKG_FILES) lic.txt
 	@$(call E, makensis: $@)
-	$(Q)makensis -NOCD -V1 "-XOutFile $@" "-XLicenseData lic.txt" $<
+	$(Q)$(CFG_MAKENSIS) -NOCD -V1 "-XOutFile $@" \
+                        "-XLicenseData lic.txt" $<
 	$(Q)rm -f lic.txt
+endif
 
 $(PKG_TAR): $(PKG_FILES)
 	@$(call E, making dist dir)