← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ben/utopic-proposed

« back to all changes in this revision

Viewing changes to myocamlbuild.ml

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2014-08-31 23:15:45 UTC
  • mfrom: (1.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20140831231545-9798mxscfgc47m8k
Tags: 0.6.11.2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Show Ubuntu logo.
  - Allow configs to request the Packages/Sources files are not
    redownloaded (so that we can download once and for all at the start).
  - Add an Ubuntu template.
  - Tolerate templates with buildds or critical_bugs entries that return
    None.

Show diffs side-by-side

added added

removed removed

Lines of Context:
myocamlbuild.ml
26
26
  "dynlink";
27
27
  "unix";
28
28
  "pcre";
 
29
  "netstring";
29
30
  "ocamlgraph";
30
31
  "tyxml";
31
32
  "fileutils";
76
77
             List.iter flag ["ocamldep"; "compile"; "link"; "doc"])
77
78
          packages;
78
79
 
 
80
        flag ["ocaml"; "compile"; "native"] (S[A"-inline"; A"1000"]);
 
81
        flag ["ocaml"; "link"; "native"] (S[A"-inline"; A"1000"]);
 
82
 
79
83
        (* why isn't this done by default? *)
80
84
        flag ["library"; "link"; "thread"] (A"-thread");
81
85
 
87
91
        flag ["link"; "library"; "ocaml"; "native"; "use_libbenl"]
88
92
          (S[A"-cclib"; A"-lbenl"]);
89
93
        flag ["link"; "program"; "ocaml"; "byte"; "use_libbenl"]
90
 
          (S[A"-dllib"; A"-lbenl"]);
 
94
          (S[A"-I"; A"lib"; A"-dllib"; A"-lbenl"]);
91
95
        dep  ["link"; "ocaml"; "use_libbenl"] ["lib/libbenl.a"];
92
96
 
93
97
        (* rule for the main executable that will link all frontends  *)