From 6da80358ad9e03f041c766d64cf0b25ac23a52ce Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Wed, 17 Dec 2014 20:30:35 +0300
Subject: [PATCH] Native aware dep generation

Fugly
---
 build.ninja  | 2 +-
 configure.sh | 2 ++
 doocaml.sh   | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.ninja b/build.ninja
index f9d6d02..fa71fbd 100644
--- a/build.ninja
+++ b/build.ninja
@@ -16,7 +16,7 @@ rule ocamlc
      deps = gcc
      depfile = $out.d
      command = env incs="$incs" pp="$pp" /bin/sh $srcdir/doocaml.sh $
-             $ocamlc $out $in -c $ocamlflags
+             $ocamlc $out $in $ignext -c $ocamlflags
      description = ocamlc $out
 
 rule genhelp
diff --git a/configure.sh b/configure.sh
index 255d7d4..2be089d 100644
--- a/configure.sh
+++ b/configure.sh
@@ -73,12 +73,14 @@ EOF
  test $native && {
      echo "cmo=.cmx"
      echo "cma=.cmxa"
+     echo "ignext=.cmo"
      echo "ocamlc=ocamlopt.opt"
      echo "linksocclib=-cclib"
      echo "customflag="
  } || {
      echo "cmo=.cmo"
      echo "cma=.cma"
+     echo "ignext=.cmx"
      echo "ocamlc=ocamlc.opt"
      echo "linksocclib="
      echo "customflag=-custom"
diff --git a/doocaml.sh b/doocaml.sh
index f4651f5..16daf5a 100644
--- a/doocaml.sh
+++ b/doocaml.sh
@@ -4,16 +4,17 @@ set -e
 compiler="$1"
 out="$2"
 in="$3"
+ignext="$4"
 outdir="$(dirname "$out")"
 srcdir="$(pwd -P)"
 
-shift 3
+shift 4
 
 dodep ()
 {
     (cd >/dev/null $srcdir && ocamldep.opt ${1+"$@"} $(basename $in)) | \
         (sed >$objdir/$out.d                                            \
-             -e '/\(.cmx\|:$\)/d'                                       \
+             -e "/\($ignext\|:\$\)/d"                                   \
              -e 's;\([[:alnum:]\.]\+\);'$outdir'/\1;g')
 }
 
-- 
2.11.4.GIT