summaryrefslogtreecommitdiff
path: root/README.win32.adoc
diff options
context:
space:
mode:
authorGabriel Scherer <gabriel.scherer@gmail.com>2017-12-10 17:14:12 +0100
committerGitHub <noreply@github.com>2017-12-10 17:14:12 +0100
commit3882302fa6d08fc151c8e69cc1f45281e89dc19e (patch)
tree0d6a0e92ed21c10ab6d8a1cc519a6f989a112724 /README.win32.adoc
parentca71bda2ac7e5143f58fa9a1693f97e709a91332 (diff)
parentaf78f0236848572d549df6456bf2e3f34d921a0e (diff)
downloadocaml-3882302fa6d08fc151c8e69cc1f45281e89dc19e.tar.gz
Merge pull request #1434 from damiendoligez/makefile-cleanup
Makefile cleanup
Diffstat (limited to 'README.win32.adoc')
-rw-r--r--README.win32.adoc13
1 files changed, 9 insertions, 4 deletions
diff --git a/README.win32.adoc b/README.win32.adoc
index 57ef54fa5a..ccec496b2e 100644
--- a/README.win32.adoc
+++ b/README.win32.adoc
@@ -188,7 +188,7 @@ the top-level of the OCaml distribution by running:
eval $(tools/msvs-promote-path)
-If you forget to do this, `make world` will fail relatively
+If you forget to do this, `make world.opt` will fail relatively
quickly as it will be unable to link `ocamlrun`.
Now run:
@@ -210,7 +210,8 @@ which indicates where to install everything.
Finally, use `make` to build the system, e.g.
- make world bootstrap opt opt.opt install
+ make world.opt
+ make install
After installing, it is not necessary to keep the Cygwin installation (although
you may require it to build additional third party libraries and tools). You
@@ -281,7 +282,8 @@ which indicates where to install everything.
Finally, use `make` to build the system, e.g.
- make world bootstrap opt opt.opt install
+ make world.opt
+ make install
After installing, you will need to ensure that `ocamlopt` (or `ocamlc -custom`)
can access the C compiler. You can do this either by using OCaml from Cygwin's
@@ -327,7 +329,10 @@ done in one of three ways:
OCaml is then compiled as normal for the port you require, except that before
compiling `world`, you must compile `flexdll`, i.e.:
- make flexdll world [bootstrap] opt opt.opt flexlink.opt install
+ make flexdll
+ make world.opt
+ make flexlink.opt
+ make install
* You should ignore the error messages that say ocamlopt was not found.
* `make install` will install FlexDLL by placing `flexlink.exe`