[MLton-commit] r7225

[Wesley Terpstra]

Build constants using new cross compiler


----------------------------------------------------------------------

U   mlton/trunk/package/mingw/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/package/mingw/Makefile
===================================================================
--- mlton/trunk/package/mingw/Makefile	2009-09-14 20:05:31 UTC (rev 7224)
+++ mlton/trunk/package/mingw/Makefile	2009-09-15 12:20:37 UTC (rev 7225)
@@ -34,12 +34,13 @@
 	mkdir -p staging/lib/mlton/x86_64-w64-mingw32/include
 	cp ../../runtime.x64/gen/c-types.h staging/lib/mlton/x86_64-w64-mingw32/include
 	cp ../../runtime.x64/gen/sizes ../../runtime.x64/*.a staging/lib/mlton/x86_64-w64-mingw32
+	echo "x86_64-w64-mingw32 amd64 mingw" >> staging/lib/mlton/target-map
 	rm staging/lib/mlton/x86_64-w64-mingw32/*-gdb.a
-	rm -rf ../../runtime.x64
-	$(MLTON) -target x86_64-w64-mingw32 -build-constants true > staging/w64-constants.c
-	$(MLTON) -target x86_64-w64-mingw32 -verbose 1 staging/w64-constants.c
+	rm -rf ../../runtime.x64
+	sed "s@'/lib/mlton'@\`cd \"\$dir/lib/mlton\" \&\& pwd\`@" < staging/bin/mlton > staging/mlton
+	./staging/mlton -target x86_64-w64-mingw32 -build-constants true > staging/w64-constants.c
+	./staging/mlton -target x86_64-w64-mingw32 -verbose 1 staging/w64-constants.c
 	./staging/w64-constants > staging/lib/mlton/x86_64-w64-mingw32/constants
-	echo "x86_64-w64-mingw32 amd64 mingw" >> staging/lib/mlton/target-map
 	cd staging; find lib/mlton/x86_64-w64-mingw32 lib/mlton/sml/basis/config/c/amd64-mingw -type f > ../$@.tmp
 	mv $@.tmp $@