Add --disable-ocamltest

This commit is contained in:
David Allsopp 2020-01-16 16:50:27 +00:00
parent d26d37bf97
commit b03c1c78c7
5 changed files with 19 additions and 3 deletions

View File

@ -194,6 +194,9 @@ Working version
### Build system:
- #9250: Add --disable-ocamltest to configure
(David Allsopp, review by Sébastien Hinderer)
### Bug fixes:
- #7683, #1499: Fixes one case where the evaluation order in native-code

View File

@ -68,6 +68,7 @@ DEPFLAGS=-slash
DEPINCLUDES=$(INCLUDES)
OCAMLDOC_OPT=$(WITH_OCAMLDOC:=.opt)
OCAMLTEST_OPT=$(WITH_OCAMLTEST:=.opt)
BYTESTART=driver/main.cmo
@ -210,11 +211,12 @@ opt.opt: checknative
$(MAKE) ocaml
$(MAKE) opt-core
$(MAKE) ocamlc.opt
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) ocamltest
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) \
$(WITH_OCAMLTEST)
$(MAKE) ocamlopt.opt
$(MAKE) otherlibrariesopt
$(MAKE) ocamllex.opt ocamltoolsopt ocamltoolsopt.opt $(OCAMLDOC_OPT) \
ocamltest.opt
$(OCAMLTEST_OPT)
ifneq "$(WITH_OCAMLDOC)" ""
$(MAKE) manpages
endif
@ -244,7 +246,8 @@ coreboot:
.PHONY: all
all: coreall
$(MAKE) ocaml
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) ocamltest
$(MAKE) otherlibraries $(WITH_DEBUGGER) $(WITH_OCAMLDOC) \
$(WITH_OCAMLTEST)
ifneq "$(WITH_OCAMLDOC)" ""
$(MAKE) manpages
endif

View File

@ -215,6 +215,7 @@ RUNTIMEI=@instrumented_runtime@
WITH_DEBUGGER=@with_debugger@
WITH_CAMLTEX=@with_camltex@
WITH_OCAMLDOC=@ocamldoc@
WITH_OCAMLTEST=@ocamltest@
ASM_CFI_SUPPORTED=@asm_cfi_supported@
WITH_FRAME_POINTERS=@frame_pointers@
WITH_SPACETIME=@spacetime@

BIN
configure vendored

Binary file not shown.

View File

@ -129,6 +129,7 @@ AC_SUBST([as_has_debug_prefix_map])
AC_SUBST([with_debugger]) # TODO: rename this variable
AC_SUBST([with_camltex])
AC_SUBST([ocamldoc])
AC_SUBST([ocamltest])
AC_SUBST([pthread_link])
AC_SUBST([x_includes])
AC_SUBST([x_libraries])
@ -276,6 +277,10 @@ AC_ARG_ENABLE([ocamldoc],
[],
[ocamldoc=auto])
AC_ARG_ENABLE([ocamltest],
[AS_HELP_STRING([--disable-ocamltest],
[do not build the ocamltest driver])])
AC_ARG_ENABLE([frame-pointers],
[AS_HELP_STRING([--enable-frame-pointers],
[use frame pointers in runtime and generated code])])
@ -1675,6 +1680,10 @@ AS_IF([test x"$enable_ocamldoc" = "xno"],
[ocamldoc=""],
[ocamldoc=ocamldoc])
AS_IF([test x"$enable_ocamltest" = "xno"],
[ocamltest=""],
[ocamltest=ocamltest])
AS_IF([test x"$enable_flambda" = "xyes"],
[flambda=true
AS_IF([test x"$enable_flambda_invariants" = "xyes"],