From c555a5bd6e72b0d4c15a74b6f1b93ac445ed22bd Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Sun, 3 Jan 2021 17:19:49 +0000
Subject: Allow bootstrapping flexdll for the Cygwin ports

---
 Makefile.config.in | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Makefile.config.in')

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
-- 
cgit v1.2.1