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 /utils | |
| parent | e9723139769a4df610fadba0fdeecab298c1c17e (diff) | |
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 'utils')
| -rw-r--r-- | utils/config.mlbuild | 3 | ||||
| -rw-r--r-- | utils/config.mli | 4 | ||||
| -rw-r--r-- | utils/config.mlp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/utils/config.mlbuild b/utils/config.mlbuild index 264ed6dad..e90313cf8 100644 --- a/utils/config.mlbuild +++ b/utils/config.mlbuild @@ -47,7 +47,8 @@ let standard_runtime = if windows then "ocamlrun" else C.bindir^"/ocamlrun" let ccomp_type = C.ccomptype -let bytecomp_c_compiler = sf "%s %s %s" C.bytecc C.bytecccompopts C.sharedcccompopts +let bytecomp_c_compiler = + sf "%s %s %s" C.bytecc C.bytecccompopts C.sharedcccompopts let bytecomp_c_libraries = C.bytecclibs let native_c_compiler = sf "%s %s" C.nativecc C.nativecccompopts let native_c_libraries = C.nativecclibs diff --git a/utils/config.mli b/utils/config.mli index 7b178e573..c9b8904d7 100644 --- a/utils/config.mli +++ b/utils/config.mli @@ -34,8 +34,8 @@ val native_c_compiler: string val native_c_libraries: string (* The C libraries to link with native-code programs *) val native_pack_linker: string - (* The linker to use for packaging (ocamlopt -pack) and for partial links - (ocamlopt -output-obj). *) + (* The linker to use for packaging (ocamlopt -pack) and for partial + links (ocamlopt -output-obj). *) val mkdll: string (* The linker command line to build dynamic libraries. *) val mkexe: string diff --git a/utils/config.mlp b/utils/config.mlp index f77bc54f9..af9808bda 100644 --- a/utils/config.mlp +++ b/utils/config.mlp @@ -138,6 +138,6 @@ let print_config oc = p "ast_intf_magic_number" ast_intf_magic_number; p "cmxs_magic_number" cmxs_magic_number; p "cmt_magic_number" cmt_magic_number; - + flush oc; ;; |