diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2021-01-03 15:46:53 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2021-05-11 13:53:58 +0100 |
| commit | 375b7cd4bb345a1fe25b3669dca5c86b21eef469 (patch) | |
| tree | 02cdb28ee775e6a7d0fdbbffa183f8560ef39eb1 /README.win32.adoc | |
| parent | b96040decbeef3794bdad38fab51edf781c51db5 (diff) | |
| download | ocaml-375b7cd4bb345a1fe25b3669dca5c86b21eef469.tar.gz | |
Overhaul flexlink binary locations during build
The bytecode image of flexlink now lives in boot/flexlink.byte$(EXE).
This eliminates the dance done in flexlink.opt to preserve
flexdll/flexlink.exe as being a bytecode image. The native-compiled
version of flexlink now lives in flexlink.opt$(EXE) and is automatically
built as part of opt.opt.
Refactor installation targets to install flexlink.byte.exe and
flexlink.opt.exe as for other tools.
Diffstat (limited to 'README.win32.adoc')
| -rw-r--r-- | README.win32.adoc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/README.win32.adoc b/README.win32.adoc index 5dc637a41b..98552dce4e 100644 --- a/README.win32.adoc +++ b/README.win32.adoc @@ -317,13 +317,10 @@ OCaml is then compiled normally for the port you require. * `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 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 - `make flexdll`. If you wish to revert to using an externally - installed FlexDLL, you must erase the contents of `flexdll/` before - compiling. + * If you have populated `flexdll/`, the build will always use it, ignoring + any externally installed FlexDLL. You can override this behaviour by either + erasing the contents of `flexdll/` or passing the `--without-flexdll` option + to `configure`. == Unicode support |