← Back to branch summary

~ubuntu-branches/debian/sid/ocaml/sid

« back to all changes in this revision

Viewing changes to ocamlbuild/ocamlbuild_unix_plugin.ml

  • Committer: Bazaar Package Importer
  • Author(s): Stéphane Glondu
  • Date: 2011-04-21 21:35:08 UTC
  • mfrom: (1.1.11 upstream) (12.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110421213508-kg34453aqmb0moha
* Fixes related to -output-obj with g++ (in debian/patches):
  - add Declare-primitive-name-table-as-const-char
  - add Avoid-multiple-declarations-in-generated-.c-files-in
  - fix Embed-bytecode-in-C-object-when-using-custom: the closing
    brace for extern "C" { ... } was missing in some cases

Show diffs side-by-side

added added

removed removed

Lines of Context:
ocamlbuild/ocamlbuild_unix_plugin.ml
58
58
  in close (); res
59
59
 
60
60
let stdout_isatty () =
61
 
  Unix.isatty Unix.stdout
 
61
  Unix.isatty Unix.stdout &&
 
62
    try Unix.getenv "TERM" <> "dumb" with Not_found -> true
62
63
 
63
64
let execute_many =
64
65
  let exit i = raise (My_std.Exit_with_code i) in
81
82
  implem.at_exit_once <- at_exit_once;
82
83
  implem.is_link <- is_link;
83
84
  implem.stat <- mkstat Unix.stat;
84
 
  implem.lstat <- mkstat Unix.lstat;
 
85
  implem.lstat <- mkstat Unix.lstat;;