diff options
| author | Damien Doligez <damien.doligez@gmail.com> | 2017-10-05 16:48:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 16:48:08 +0200 |
| commit | db88523db34b8066980aec074d4a224671687875 (patch) | |
| tree | 805b374eb16273ed6bef9ca9a22d4a05a95b4db0 | |
| parent | 3b98adfe2e65273f8a240ad6fcd1c1c135ffdabc (diff) | |
| download | ocaml-db88523db34b8066980aec074d4a224671687875.tar.gz | |
Fix flexdll section in README (#1359)
Fix flexdll section in `README.win32.adoc`.
Pass the whole OCaml config to the Flexdll Makefile instead of a few chosen variables.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | README.win32.adoc | 5 |
2 files changed, 7 insertions, 5 deletions
@@ -566,6 +566,7 @@ flexdll/Makefile: .PHONY: flexdll flexdll: flexdll/Makefile flexlink $(MAKE) -C flexdll \ + OCAML_CONFIG_FILE=../config/Makefile \ MSVC_DETECT=0 CHAINS=$(FLEXDLL_CHAIN) NATDYNLINK=false support # Bootstrapping flexlink - leaves a bytecode image of flexlink.exe in flexdll/ @@ -575,8 +576,8 @@ flexlink: flexdll/Makefile cp byterun/ocamlrun$(EXE) boot/ocamlrun$(EXE) $(MAKE) -C stdlib COMPILER=../boot/ocamlc stdlib.cma std_exit.cmo cd stdlib && cp stdlib.cma std_exit.cmo *.cmi ../boot - $(MAKE) -C flexdll MSVC_DETECT=0 TOOLCHAIN=$(TOOLCHAIN) \ - TOOLPREF=$(TOOLPREF) CHAINS=$(FLEXDLL_CHAIN) NATDYNLINK=false \ + $(MAKE) -C flexdll MSVC_DETECT=0 OCAML_CONFIG_FILE=../config/Makefile \ + CHAINS=$(FLEXDLL_CHAIN) NATDYNLINK=false \ OCAMLOPT="../boot/ocamlrun ../boot/ocamlc -I ../boot" \ flexlink.exe $(MAKE) -C byterun clean @@ -587,7 +588,7 @@ flexlink.opt: cd flexdll && \ mv flexlink.exe flexlink && \ $(MAKE) OCAML_FLEXLINK="../boot/ocamlrun ./flexlink" MSVC_DETECT=0 \ - TOOLCHAIN=$(TOOLCHAIN) TOOLPREF=$(TOOLPREF) \ + OCAML_CONFIG_FILE=../config/Makefile \ OCAMLOPT="../ocamlopt.opt -I ../stdlib" flexlink.exe && \ mv flexlink.exe flexlink.opt && \ mv flexlink flexlink.exe diff --git a/README.win32.adoc b/README.win32.adoc index 61ea942259..a5ea725908 100644 --- a/README.win32.adoc +++ b/README.win32.adoc @@ -327,12 +327,13 @@ 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 install + make flexdll world [bootstrap] opt opt.opt flexlink.opt install + * You should ignore the error messages that say ocamlopt was not found. * `make install` will install FlexDLL by placing `flexlink.exe` (and the default manifest file for the Microsoft port) in `bin/` and the FlexDLL object files in `lib/`. - * If you don't include `make opt.opt`, `flexlink.exe` will be a + * If you don't include `make flexlink.opt`, `flexlink.exe` will be a bytecode program. `make install` always installs the "best" `flexlink.exe` (i.e. there is never a `flexlink.opt.exe` installed). * If you have populated `flexdll/`, you *must* run |