Make windows packaging work again

Author: brson

mk/dist.mk

@@ -62,9 +62,9 @@ nsis-dist: $(PKG_EXE)
 
 lic.txt: $(S)LICENSE.txt
 	@$(call E, crlf: $@)
-	@$(Q)perl -pe 's@\n@\r\n@go' <$< >$@
+	@$(Q)perl -pe 's@\r\n|\n@\r\n@go' <$< >$@
 
-$(PKG_EXE): $(PKG_NSI) $(PKG_FILES) $(DOCS) $(SREQ3) lic.txt
+$(PKG_EXE): $(PKG_NSI) $(PKG_FILES) $(DOCS) $(SREQ3$(CFG_HOST_TRIPLE)) lic.txt
 	@$(call E, makensis: $@)
 	$(Q)makensis -NOCD -V1 "-XOutFile $@" "-XLicenseData lic.txt" $<
 	$(Q)rm -f lic.txt

src/etc/pkg/rust.nsi

@@ -10,26 +10,29 @@ ShowUninstDetails "show"
 SetCompressor "lzma"
 LicenseForceSelection checkbox
 
+InstallDir $PROGRAMFILES\Rust
+
 Page license
-Page components
 Page directory
 Page instfiles
 UninstPage uninstConfirm
 UninstPage instfiles
 
 
 Section "Compiler"
-    SetOutPath $INSTDIR
-    File /oname=rustc.exe     stage3\rustc.exe
-    File /oname=rustllvm.dll  stage3\rustllvm.dll
-    File /oname=rustrt.dll    stage3\rustrt.dll
-    File /oname=std.dll       stage3\std.dll
+    SetOutPath $INSTDIR\bin
+    File /oname=rustc.exe      stage3\bin\rustc.exe
 
     SetOutPath $INSTDIR\lib
-    File /oname=rustrt.dll   stage3\lib\rustrt.dll
-    File /oname=std.dll      stage3\lib\std.dll
-    File /oname=main.o       stage3\lib\main.o
-    File /oname=glue.o       stage3\lib\glue.o
+    File /oname=rustllvm.dll   stage3\lib\rustllvm.dll
+    File /oname=rustrt.dll     stage3\lib\rustrt.dll
+    File /oname=std.dll        stage3\lib\std.dll
+
+    SetOutPath $INSTDIR\lib\rustc\i686-pc-mingw32\lib
+    File /oname=rustrt.dll    stage3\lib\rustc\i686-pc-mingw32\lib\rustrt.dll
+    File /oname=std.dll       stage3\lib\rustc\i686-pc-mingw32\lib\std.dll
+    File /oname=main.o        stage3\lib\rustc\i686-pc-mingw32\lib\main.o
+    File /oname=intrinsics.bc stage3\lib\rustc\i686-pc-mingw32\lib\intrinsics.bc
 SectionEnd
 
 Section "Documentation"