[MLton-commit] r6458

[spoons at mlton.org]

Small fix to makefile (follows other changes to build).
----------------------------------------------------------------------

U   mlton/branches/shared-heap-multicore/Makefile
U   mlton/branches/shared-heap-multicore/mlton/Makefile

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

Modified: mlton/branches/shared-heap-multicore/Makefile
===================================================================
--- mlton/branches/shared-heap-multicore/Makefile	2008-03-03 15:44:51 UTC (rev 6457)
+++ mlton/branches/shared-heap-multicore/Makefile	2008-03-04 15:31:43 UTC (rev 6458)
@@ -102,7 +102,7 @@
 
 .PHONY: compiler
 compiler:
-	$(MAKE) -C "$(COMP)"
+	$(MAKE) -C "$(COMP)" MLTON=$(MLTON)
 	$(CP) "$(COMP)/$(AOUT)$(EXE)" "$(LIB)/"
 
 .PHONY: constants

Modified: mlton/branches/shared-heap-multicore/mlton/Makefile
===================================================================
--- mlton/branches/shared-heap-multicore/mlton/Makefile	2008-03-03 15:44:51 UTC (rev 6457)
+++ mlton/branches/shared-heap-multicore/mlton/Makefile	2008-03-04 15:31:43 UTC (rev 6458)
@@ -12,7 +12,9 @@
 HOST_ARCH := $(shell "$(SRC)/bin/host-arch")
 HOST_OS := $(shell "$(SRC)/bin/host-os")
 LIB := $(BUILD)/lib
+ifeq (other, $(shell if [ ! -x "$(MLTON)" ]; then echo other; fi))
 MLTON := mlton
+endif
 TARGET := self
 AOUT := mlton-compile
 UP := upgrade-basis.sml
@@ -82,7 +84,7 @@
 	rm -f $(UP)
 	$(MAKE) $(UP)
 	@echo 'Compiling mlton (takes a while)'
-	mlton $(FLAGS) $(FILE)
+	$(MLTON) $(FLAGS) $(FILE)
 
 #! Pass $(PATH) to upgrade-basis because it is run via #!/usr/bin/env
 # bash, which resets the path.