diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
commit | 7844495624be79259e613182e6a615319b2f4376 (patch) | |
tree | 8656b9339174ab9061b42be2b50c2d9563401c8a /tools/ocamlmktop.ml | |
parent | e9723139769a4df610fadba0fdeecab298c1c17e (diff) | |
download | ocaml-7844495624be79259e613182e6a615319b2f4376.tar.gz |
Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools/ocamlmktop.ml')
-rw-r--r-- | tools/ocamlmktop.ml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/ocamlmktop.ml b/tools/ocamlmktop.ml index ee21f76e40..06288d740b 100644 --- a/tools/ocamlmktop.ml +++ b/tools/ocamlmktop.ml @@ -12,4 +12,6 @@ let _ = let args = Ccomp.quote_files (List.tl (Array.to_list Sys.argv)) in - exit(Sys.command("ocamlc -I +compiler-libs -linkall ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma " ^ args ^ " topstart.cmo")) + exit(Sys.command("ocamlc -I +compiler-libs -linkall ocamlcommon.cma \ + ocamlbytecomp.cma ocamltoplevel.cma " + ^ args ^ " topstart.cmo")) |