X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=tools%2Focamldriver.sh;h=6d8e39bceaa69ee1d7440bb08011c1835e289719;hp=d2a968e2baf52d9a188eb963fc2ff7eaf9f0b910;hb=31d45495fda9a110fd348f8b492761c28b434ec9;hpb=456aa2cae4ba3afc4fe364880e52f66490700650 diff --git a/tools/ocamldriver.sh b/tools/ocamldriver.sh index d2a968e..6d8e39b 100644 --- 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#?} - if test "$OCAMLNATIVE"; then + if test "$NATIVE"; then 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 ':'` - objects=`tools/ocamlmoduledep.sh -inter $OCAMLNATIVE $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 @@ -33,14 +33,14 @@ fi if test "$DOPACK"; then modules=`cat ${base}.pack` - objects=`echo $modules | xargs tools/ocamlmoduledep.sh $OCAMLNATIVE $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 - objects=`tools/ocamlmoduledep.sh $INTER $OCAMLNATIVE $PACKINCLUDE -I $SRC $modules` + objects=`tools/ocamlmoduledep.sh $INTER $NATIVE $PACKINCLUDE -I $SRC $modules` fi $REMAKE $objects