Remove passing $NATIVE on the remake command line of every target, since variable...

[tatoo.git] / tools / ocamldriver.sh

diff --git a/tools/ocamldriver.sh b/tools/ocamldriver.sh
index 6d8e39b..d2a968e 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#?}
-    if test "$NATIVE"; then
+    if test "$OCAMLNATIVE"; 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 $NATIVE $PACKINCLUDE -I $SRC $modules`
+    objects=`tools/ocamlmoduledep.sh -inter $OCAMLNATIVE $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 $NATIVE $PACKINCLUDE -I $SRC `
+    objects=`echo $modules | xargs tools/ocamlmoduledep.sh $OCAMLNATIVE $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 $NATIVE $PACKINCLUDE -I $SRC $modules`
+    objects=`tools/ocamlmoduledep.sh $INTER $OCAMLNATIVE $PACKINCLUDE -I $SRC $modules`
 fi
 
 $REMAKE $objects