summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSébastien Hinderer <Sebastien.Hinderer@inria.fr>2018-10-23 08:58:00 +0200
committerSébastien Hinderer <Sebastien.Hinderer@inria.fr>2018-10-23 09:01:29 +0200
commite473b670812fc0a7d0fa8bf75d4c58d485124c65 (patch)
tree748893967dbf1a1715185e28a53155755de0d35c /tools
parentb799715caee3d45a9fd2d11dc1fa6a6d45da3178 (diff)
downloadocaml-e473b670812fc0a7d0fa8bf75d4c58d485124c65.tar.gz
runtime: move the definition of INT64_LITERAL from m.h to config.h
Diffstat (limited to 'tools')
-rw-r--r--tools/ocamlmklib.ml20
1 files changed, 9 insertions, 11 deletions
diff --git a/tools/ocamlmklib.ml b/tools/ocamlmklib.ml
index 2dd8f4af01..b5c0aee539 100644
--- a/tools/ocamlmklib.ml
+++ b/tools/ocamlmklib.ml
@@ -21,17 +21,15 @@ let syslib x =
let mklib out files opts =
if Config.ccomp_type = "msvc"
- then
- let machine =
- if Config.architecture="amd64"
- then "-machine:AMD64 "
- else ""
- in
- Printf.sprintf "link -lib -nologo %s-out:%s %s %s"
- machine out opts files
- else
- Printf.sprintf "%s rcs %s %s %s && %s %s"
- Config.ar out opts files Config.ranlib out
+ then let machine =
+ if Config.architecture="amd64"
+ then "-machine:AMD64 "
+ else ""
+ in
+ Printf.sprintf "link -lib -nologo %s-out:%s %s %s"
+ machine out opts files
+ else Printf.sprintf "%s rcs %s %s %s && %s %s"
+ Config.ar out opts files Config.ranlib out
(* PR#4783: under Windows, don't use absolute paths because we do
not know where the binary distribution will be installed. *)