diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2017-01-27 16:08:41 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2017-04-09 19:00:06 +0200 |
| commit | 65fd726329e9f28936b3991a817d5ce5df1a55da (patch) | |
| tree | 9227c11f40ad1e2914784f1af51a9332ed0260b1 /driver | |
| parent | 614dd0b7566d48cc73a13fe9696ac9fe2b2cba9d (diff) | |
| download | ocaml-65fd726329e9f28936b3991a817d5ce5df1a55da.tar.gz | |
Install bootstrapped FlexDLL objects to flexdll/
The install-flexdll target now puts the object files for FlexDLL in a
subdirectory flexdll of the Standard Library instead of in the Standard
Library itself.
A configuration tweak means that -I +flexdll is effectively added to all
compiler invocations and also a pseudo-option -L+flexdll to ocamlmklib
calls to Config.mkdll which fixes PR#7373.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/compmisc.ml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/driver/compmisc.ml b/driver/compmisc.ml index 47f69077a4..bf45f6658a 100644 --- a/driver/compmisc.ml +++ b/driver/compmisc.ml @@ -29,7 +29,9 @@ let init_path ?(dir="") native = else !Clflags.include_dirs in - let dirs = !last_include_dirs @ dirs @ !first_include_dirs in + let dirs = + !last_include_dirs @ dirs @ Config.flexdll_dirs @ !first_include_dirs + in let exp_dirs = List.map (Misc.expand_directory Config.standard_library) dirs in Config.load_path := dir :: |