FlexDLL needed before configuration for 4.13

ocaml · Jun 14, 2024 · 08c211c · 08c211c
1 parent 34eff69
commit 08c211c
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/shell/bootstrap-ocaml.sh b/shell/bootstrap-ocaml.sh
@@ -119,22 +119,19 @@ if [ -n "$1" -a -n "${COMSPEC}" -a -x "${COMSPEC}" ] ; then
   if [ -n "${PATH_PREPEND}" ] ; then
     PATH_PREPEND="${PATH_PREPEND}:"
   fi
-  PREFIX=`cd .. ; pwd`/ocaml
-  WINPREFIX=`echo ${PREFIX} | cygpath -f - -m`
-  if [ ${GEN_CONFIG_ONLY} -eq 0 ] ; then
-    # --disable-ocamldoc can change to --disable-stdlib-manpages when bumped to 4.11
-    PATH="${PATH_PREPEND}${PREFIX}/bin:${PATH}" Lib="${LIB_PREPEND}${Lib}" Include="${INC_PREPEND}${Include}" ./configure --prefix "$WINPREFIX" --build=$BUILD --host=$HOST --disable-ocamldoc
-  fi
   cd ..
   if [ ! -e ${FLEXDLL} ]; then
     cp ../src_ext/archives/${FLEXDLL} . 2>/dev/null || ${CURL} ${FV_URL}
   fi
   cd ocaml-${V}
+  PREFIX=`cd .. ; pwd`/ocaml
+  WINPREFIX=`echo ${PREFIX} | cygpath -f - -m`
   if [ ${GEN_CONFIG_ONLY} -eq 0 ] ; then
     tar -xzf ../${FLEXDLL}
     rm -rf flexdll
     mv flexdll-* flexdll
-    PATH="${PATH_PREPEND}${PREFIX}/bin:${PATH}" Lib="${LIB_PREPEND}${Lib}" Include="${INC_PREPEND}${Include}" make -j flexdll
+    # --disable-ocamldoc can change to --disable-stdlib-manpages when bumped to 4.11
+    PATH="${PATH_PREPEND}${PREFIX}/bin:${PATH}" Lib="${LIB_PREPEND}${Lib}" Include="${INC_PREPEND}${Include}" ./configure --prefix "$WINPREFIX" --build=$BUILD --host=$HOST --disable-ocamldoc
     PATH="${PATH_PREPEND}${PREFIX}/bin:${PATH}" Lib="${LIB_PREPEND}${Lib}" Include="${INC_PREPEND}${Include}" make -j world.opt
     PATH="${PATH_PREPEND}${PREFIX}/bin:${PATH}" Lib="${LIB_PREPEND}${Lib}" Include="${INC_PREPEND}${Include}" make install
   fi