diff options
| author | Damien Doligez <damien.doligez@inria.fr> | 2017-09-17 16:43:49 +0200 |
|---|---|---|
| committer | Damien Doligez <damien.doligez@inria.fr> | 2017-09-17 16:46:08 +0200 |
| commit | 535390f8f0b6d40f130ebcb7f804ecd6804f6cac (patch) | |
| tree | 718a4e8ad3a8969a867f8d6a23fe1460f6daa7fe /utils/ccomp.ml | |
| parent | 712505d3ebeb94855fcce758b1b15c53c05d84b1 (diff) | |
| download | ocaml-535390f8f0b6d40f130ebcb7f804ecd6804f6cac.tar.gz | |
Fix output-complete-obj for MSVC:
- bug in ccomp.ml
- bug in test Makefile
- disable testing bytecode on MSVC: AFAICT this never worked.
Diffstat (limited to 'utils/ccomp.ml')
| -rw-r--r-- | utils/ccomp.ml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/ccomp.ml b/utils/ccomp.ml index 204a6de5e9..3f186b3bb0 100644 --- a/utils/ccomp.ml +++ b/utils/ccomp.ml @@ -87,7 +87,9 @@ let compile_file ?output ?(opt="") name = then (Config.ocamlopt_cflags, Config.ocamlopt_cppflags) else (Config.ocamlc_cflags, Config.ocamlc_cppflags) in (String.concat " " [Config.c_compiler; cflags; cppflags])) - (match output with | None -> "" | Some o -> Printf.sprintf "%s %s" Config.c_output_obj o) + (match output with + | None -> "" + | Some o -> Printf.sprintf "%s%s" Config.c_output_obj o) opt (if !Clflags.debug && Config.ccomp_type <> "msvc" then "-g" else "") (String.concat " " (List.rev !Clflags.all_ccopts)) |