--- lib/scripts/run-smlnj.orig	2009-10-08 20:50:08.000000000 +1100
+++ lib/scripts/run-smlnj	2009-10-08 20:51:07.000000000 +1100
@@ -38,11 +38,10 @@
 
 ## compiler binaries
 
+export SMLNJ_DEVEL=yes
 SML="$ML_HOME/sml"
-ARCH_N_OPSYS="$ML_HOME/.arch-n-opsys"
 
 check_mlhome_file "$SML"
-check_mlhome_file "$ARCH_N_OPSYS"
 
 
 
@@ -83,8 +82,7 @@
 ## fix heap file name and permissions
 
 if [ -n "$OUTFILE" ]; then
-  eval $("$ARCH_N_OPSYS")
-  [ -z "$HEAP_SUFFIX" ] && HEAP_SUFFIX="$ARCH-$OPSYS"
+  [ -z "$HEAP_SUFFIX" ] && HEAP_SUFFIX="$ML_PLATFORM"
   HEAP="$OUTFILE.$HEAP_SUFFIX"
   check_heap_file "$HEAP" && mv "$HEAP" "$OUTFILE" && \
     [ -n "$NOWRITE" ] && chmod -w "$OUTFILE"