Revert "Create ordered module list without grep and an external file"

This reverts commit 8087d283c08033c61112cf7ce847433f92da5220. Bash that comes with macOS does not support associative arrays.

malc committed 5 years ago

Commit 37efe281 parent 8087d281 file · +6 −8Browse files

Unified · Split

 test -d "$mudir" || die muPDF not found, consult $(dirname $0)/BUILDING
 mkdir -p $outd/{$wsid,lablGL}
+:>$outd/ordered
 isfresh() { test -r $1.past && test "$(<$1.past)" = "$2"; }
 read cvers < <($ccomp --version)
-declare -A modset
-modord=
 bocaml1() {
-    if test -z "${modset[$3]-}"; then
+    if ! grep -q "$3" $outd/ordered; then
         bocaml2 "$@"
-        modset[$3]=+
+        echo "$3" >>"$outd/ordered"
-        test "${3%%.cmi}" != "$3" || modord="$modord $3"
     fi
 }
     bocamlc wsi/x11/xlib.o
 fi
-cmd="ocamlc -custom $libs -o $outd/llpp $cobjs $modord -cclib \"$clibs\""
+ord=$(grep -v \.cmi $outd/ordered)
-keycmd="digest $outd/llpp $cobjs $modord $mulibs"
+cmd="ocamlc -custom $libs -o $outd/llpp $cobjs $(echo $ord) -cclib \"$clibs\""
+keycmd="digest $outd/llpp $cobjs $ord $mulibs"
 isfresh "$outd/llpp" "$cmd$(eval $keycmd)" || {
     echo linking $outd/llpp
     eval "$cmd" || die "$cmd failed"

Keyboard shortcuts