small fixes for building dist on windows

Author: nikomatsakis

mk/dist.mk

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

mk/target.mk

@@ -7,7 +7,7 @@
 # If you are making non-backwards compatible changes to the runtime,
 # set this flag to 1.  It will cause stage1 to use the snapshot
 # runtime rather than the runtime from the working directory.
-USE_SNAPSHOT_RUNTIME=0
+USE_SNAPSHOT_RUNTIME=1
 
 define TARGET_STAGE_N
 

src/rt/rust_shape.h

@@ -26,8 +26,8 @@
 
 namespace shape {
 
-typedef unsigned long tag_variant_t;
-typedef unsigned long tag_align_t;
+typedef unsigned tag_variant_t;
+typedef unsigned tag_align_t;
 typedef unsigned long ref_cnt_t;
 
 // Constants