diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2021-01-03 17:19:49 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2021-05-11 13:54:00 +0100 |
| commit | c555a5bd6e72b0d4c15a74b6f1b93ac445ed22bd (patch) | |
| tree | f968decc14aed519c07008c4d3a1fac9dee19b5d /Makefile.config.in | |
| parent | 375b7cd4bb345a1fe25b3669dca5c86b21eef469 (diff) | |
| download | ocaml-c555a5bd6e72b0d4c15a74b6f1b93ac445ed22bd.tar.gz | |
Allow bootstrapping flexdll for the Cygwin ports
Diffstat (limited to 'Makefile.config.in')
| -rw-r--r-- | Makefile.config.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index adcb8a09d0..c7bcf0c2a9 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -204,6 +204,7 @@ NATIVECCLIBS=@nativecclibs@ SYSTHREAD_SUPPORT=@systhread_support@ PACKLD=@PACKLD@ IFLEXDIR=@iflexdir@ +FLEXDLL_CHAIN=@flexdll_chain@ EXTRALIBS=@extralibs@ CCOMPTYPE=@ccomptype@ TOOLCHAIN=@toolchain@ @@ -270,19 +271,17 @@ ifeq "$(UNIX_OR_WIN32)" "win32" FIND=/usr/bin/find SORT=/usr/bin/sort SET_LD_PATH=PATH="$(PATH):$(LD_PATH)" - FLEXLINK_CMD=flexlink - FLEXDLL_CHAIN=@flexdll_chain@ - # FLEXLINK_FLAGS must be safe to insert in an OCaml string - FLEXLINK_FLAGS=@flexlink_flags@ - FLEXLINK=$(FLEXLINK_CMD) $(FLEXLINK_FLAGS) else # ifeq "$(UNIX_OR_WIN32)" "win32" # On Unix, make sure FLEXLINK is defined but empty - FLEXLINK = SORT=sort CYGPATH=echo SET_LD_PATH=CAML_LD_LIBRARY_PATH="$(LD_PATH)" endif # ifeq "$(UNIX_OR_WIN32)" "win32" +FLEXLINK_FLAGS=@flexlink_flags@ +FLEXLINK_CMD=flexlink +FLEXLINK=$(FLEXLINK_CMD) $(FLEXLINK_FLAGS) + # Deprecated variables ## Variables renamed in OCaml 4.13 |