Don't built ocamltest on release builds
--enable-ocamltest is paranoidly included in the CI scripts, although the trees are never pushed with a release VERSION at the tip.master
parent
b03c1c78c7
commit
fd6c0e3a03
3
Changes
3
Changes
|
@ -194,7 +194,8 @@ Working version
|
|||
|
||||
### Build system:
|
||||
|
||||
- #9250: Add --disable-ocamltest to configure
|
||||
- #9250: Add --disable-ocamltest to configure and disable building for
|
||||
non-development builds.
|
||||
(David Allsopp, review by Sébastien Hinderer)
|
||||
|
||||
### Bug fixes:
|
||||
|
|
|
@ -16661,11 +16661,12 @@ else
|
|||
ocamldoc=ocamldoc
|
||||
fi
|
||||
|
||||
if test x"$enable_ocamltest" = "xno"; then :
|
||||
ocamltest=""
|
||||
else
|
||||
ocamltest=ocamltest
|
||||
fi
|
||||
case $enable_ocamltest,4.11.0+dev0-2019-10-18 in #(
|
||||
yes,*|,*+dev*) :
|
||||
ocamltest='ocamltest' ;; #(
|
||||
*) :
|
||||
ocamltest='' ;;
|
||||
esac
|
||||
|
||||
if test x"$enable_flambda" = "xyes"; then :
|
||||
flambda=true
|
||||
|
|
|
@ -1680,9 +1680,9 @@ AS_IF([test x"$enable_ocamldoc" = "xno"],
|
|||
[ocamldoc=""],
|
||||
[ocamldoc=ocamldoc])
|
||||
|
||||
AS_IF([test x"$enable_ocamltest" = "xno"],
|
||||
[ocamltest=""],
|
||||
[ocamltest=ocamltest])
|
||||
AS_CASE([$enable_ocamltest,AC_PACKAGE_VERSION],
|
||||
[yes,*|,*+dev*],[ocamltest='ocamltest'],
|
||||
[ocamltest=''])
|
||||
|
||||
AS_IF([test x"$enable_flambda" = "xyes"],
|
||||
[flambda=true
|
||||
|
|
|
@ -56,7 +56,7 @@ function set_configuration {
|
|||
;;
|
||||
esac
|
||||
|
||||
./configure $build $host --prefix="$2"
|
||||
./configure $build $host --prefix="$2" --enable-ocamltest
|
||||
|
||||
FILE=$(pwd | cygpath -f - -m)/Makefile.config
|
||||
echo "Edit $FILE to turn C compiler warnings into errors"
|
||||
|
|
|
@ -125,7 +125,7 @@ set -ex
|
|||
# default values
|
||||
make=make
|
||||
instdir="$HOME/ocaml-tmp-install"
|
||||
confoptions="${OCAML_CONFIGURE_OPTIONS}"
|
||||
confoptions="--enable-ocamltest ${OCAML_CONFIGURE_OPTIONS}"
|
||||
make_native=true
|
||||
cleanup=false
|
||||
check_make_alldepend=false
|
||||
|
|
|
@ -125,7 +125,7 @@ host=''
|
|||
conffile=Makefile.config
|
||||
make=make
|
||||
instdir="$HOME/ocaml-tmp-install"
|
||||
confoptions="${OCAML_CONFIGURE_OPTIONS}"
|
||||
confoptions="--enable-ocamltest ${OCAML_CONFIGURE_OPTIONS}"
|
||||
make_native=true
|
||||
cleanup=false
|
||||
check_make_alldepend=false
|
||||
|
|
|
@ -102,11 +102,13 @@ EOF
|
|||
--disable-bigarray-lib \
|
||||
--disable-ocamldoc \
|
||||
--disable-native-compiler \
|
||||
--enable-ocamltest \
|
||||
$CONFIG_ARG"
|
||||
else
|
||||
configure_flags="\
|
||||
--prefix=$PREFIX \
|
||||
--enable-flambda-invariants \
|
||||
--enable-ocamltest \
|
||||
$CONFIG_ARG"
|
||||
fi
|
||||
case $XARCH in
|
||||
|
|
Loading…
Reference in New Issue