comparison repoint @ 346:90169412b1a7

Merge from branch by-id
author Chris Cannam
date Thu, 18 Jul 2019 14:58:51 +0100
parents ba3c0e70b5dd
children
comparison
equal deleted inserted replaced
333:70d19452631e 346:90169412b1a7
56 # We would prefer Poly/ML to SML/NJ, except that Poly v5.7 has a 56 # We would prefer Poly/ML to SML/NJ, except that Poly v5.7 has a
57 # nasty bug that occasionally causes it to deadlock on startup. 57 # nasty bug that occasionally causes it to deadlock on startup.
58 # That is fixed in v5.7.1, so we could promote it up the order 58 # That is fixed in v5.7.1, so we could promote it up the order
59 # again at some point in future 59 # again at some point in future
60 elif echo | poly -v 2>/dev/null | grep -q 'Poly/ML'; then 60 elif echo | poly -v 2>/dev/null | grep -q 'Poly/ML'; then
61 sml="poly" 61 sml="polyml"
62 elif mlton 2>&1 | grep -q 'MLton'; then 62 elif mlton 2>&1 | grep -q 'MLton'; then
63 sml="mlton" 63 sml="mlton"
64 # MLKit is at the bottom because it leaves compiled files around 64 # MLKit is at the bottom because it leaves compiled files around
65 # in an MLB subdir in the current directory 65 # in an MLB subdir in the current directory
66 elif mlkit 2>&1 | grep -q 'MLKit'; then 66 elif mlkit 2>&1 | grep -q 'MLKit'; then
107 arglist="$arglist\"$arg\"" 107 arglist="$arglist\"$arg\""
108 fi 108 fi
109 done 109 done
110 110
111 case "$sml" in 111 case "$sml" in
112 poly) 112 polyml)
113 if [ -n "$local_install" ] && polyc --help >/dev/null 2>&1 ; then 113 if [ -n "$local_install" ] && polyc --help >/dev/null 2>&1 ; then
114 if [ ! -x "$gen_out" ]; then 114 if [ ! -x "$gen_out" ]; then
115 polyc -o "$gen_out" "$program" 115 polyc -o "$gen_out" "$program"
116 fi 116 fi
117 "$gen_out" "$@" 117 "$gen_out" "$@"