1. james woodyatt
  2. oni

Commits

james woodyatt  committed 0268d87

Fix some parallel build dependencies.

  • Participants
  • Parent commits 8abbc24
  • Branches default

Comments (0)

Files changed (1)

File project/lang/OCaml.om

View file
  • Ignore whitespace
     
     ### Auxillary composition method
     protected.compose-aux(config, cmo, cmx, dst)=
-        private.libs=
-        export libs
+        private.outputs=
+        private.olibs=
+        private.clibs=
+        export clibs outputs
         if $(defined this.CFILES)
             private.po=$(this.OCAMLC.c-primitives $(this.CFILES), $(dst))
-            mods=$(this.OCAMLMKLIB.c-library $(this.NAME), $(po), $(dst))
-            $(mods): $(po)
-            libs+=$(mods)
-        libs+=$(this.OCAMLMKLIB.byte-library $(this.NAME), $(cmo), $(dst))
-        libs+=$(this.OCAMLMKLIB.native-library $(this.NAME), $(cmx), $(dst))
-        return $(libs)
+            clibs=$(this.OCAMLMKLIB.c-library $(this.NAME), $(po), $(dst))
+            outputs+=$(clibs)
+        olibs=$(this.OCAMLMKLIB.byte-library $(this.NAME), $(cmo), $(dst))
+        $(olibs): $(clibs)
+        outputs+=$(olibs)
+        olibs=$(this.OCAMLMKLIB.native-library $(this.NAME), $(cmx), $(dst))
+        $(olibs): $(clibs)
+        outputs+=$(olibs)
+        return $(outputs)
     
     ### Construct a new composer
     new(name, src)=