projects
/
tatoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert the integration of menhir for the time being.
[tatoo.git]
/
tools
/
ocamldriver.sh
diff --git
a/tools/ocamldriver.sh
b/tools/ocamldriver.sh
index
d2a968e
..
6d8e39b
100644
(file)
--- a/
tools/ocamldriver.sh
+++ b/
tools/ocamldriver.sh
@@
-14,7
+14,7
@@
elif test -f ${base}.pack -a -d ${base}; then
fi
if test "$PACKDIR"; then
PACKNAME=`echo $PACKDIR | cut -b1 | tr a-z A-Z`${PACKDIR#?}
fi
if test "$PACKDIR"; then
PACKNAME=`echo $PACKDIR | cut -b1 | tr a-z A-Z`${PACKDIR#?}
- if test "$
OCAML
NATIVE"; then
+ if test "$NATIVE"; then
FORPACK="-for-pack $PACKNAME"
fi
fi
FORPACK="-for-pack $PACKNAME"
fi
fi
@@
-25,7
+25,7
@@
if test "$EXT" = i; then
fi
modules=`$OCAMLDEP -modules ${base}.mli | cut -f 2- -d ':'`
fi
modules=`$OCAMLDEP -modules ${base}.mli | cut -f 2- -d ':'`
- objects=`tools/ocamlmoduledep.sh -inter $
OCAML
NATIVE $PACKINCLUDE -I $SRC $modules`
+ objects=`tools/ocamlmoduledep.sh -inter $NATIVE $PACKINCLUDE -I $SRC $modules`
$REMAKE $objects
$COMPILE -o ${target} -c $PACKINCLUDE ${base}.mli
exit 0
$REMAKE $objects
$COMPILE -o ${target} -c $PACKINCLUDE ${base}.mli
exit 0
@@
-33,14
+33,14
@@
fi
if test "$DOPACK"; then
modules=`cat ${base}.pack`
if test "$DOPACK"; then
modules=`cat ${base}.pack`
- objects=`echo $modules | xargs tools/ocamlmoduledep.sh $
OCAML
NATIVE $PACKINCLUDE -I $SRC `
+ objects=`echo $modules | xargs tools/ocamlmoduledep.sh $NATIVE $PACKINCLUDE -I $SRC `
else
$REMAKE ${base}.ml
modules=`$OCAMLDEP -modules ${base}.ml | cut -f 2- -d ':'`
if test "$EXT" = "o"; then
INTER=-inter
fi
else
$REMAKE ${base}.ml
modules=`$OCAMLDEP -modules ${base}.ml | cut -f 2- -d ':'`
if test "$EXT" = "o"; then
INTER=-inter
fi
- objects=`tools/ocamlmoduledep.sh $INTER $
OCAML
NATIVE $PACKINCLUDE -I $SRC $modules`
+ objects=`tools/ocamlmoduledep.sh $INTER $NATIVE $PACKINCLUDE -I $SRC $modules`
fi
$REMAKE $objects
fi
$REMAKE $objects