anil.recoil.org / unpac-unpac
The unpac monorepo manager self-hosting as a monorepo using unpac
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Allow MKDLL to be passed to ocamltest

Used in the testsuite to override config/Makefile's setting of MKDLL.

David Allsopp 3eae3b95 656bbdee

+9 -3
+1 -1
ocamltest/Makefile
··· 196 196 %.$(O): %.c 197 197 $(CC) $(CFLAGS) $(CPPFLAGS) $(BYTECCCOMPOPTS) -c $< 198 198 199 - ocamltest_config.ml: ocamltest_config.ml.in 199 + ocamltest_config.ml: ocamltest_config.ml.in Makefile 200 200 sed \ 201 201 -e 's|@@AFL_INSTRUMENT@@|$(AFL_INSTRUMENT)|' \ 202 202 -e 's|@@ARCH@@|$(ARCH)|' \
+2 -1
ocamltest/ocaml_actions.ml
··· 1045 1045 Ocaml_variables.ocamlopt_byte, Ocaml_files.ocamlopt ocamlsrcdir; 1046 1046 Ocaml_variables.bytecc_libs, Ocamltest_config.bytecc_libs; 1047 1047 Ocaml_variables.nativecc_libs, Ocamltest_config.nativecc_libs; 1048 - Ocaml_variables.mkdll, Ocamltest_config.mkdll; 1048 + Ocaml_variables.mkdll, 1049 + Sys.getenv_with_default_value "MKDLL" Ocamltest_config.mkdll; 1049 1050 Ocaml_variables.mkexe, Ocamltest_config.mkexe; 1050 1051 Ocaml_variables.c_preprocessor, Ocamltest_config.c_preprocessor; 1051 1052 Ocaml_variables.csc, Ocamltest_config.csc;
+6 -1
testsuite/Makefile
··· 52 52 $(wildcard $(ocamltest_directory)/ocamltest.opt$(EXE)),\ 53 53 $(wildcard $(ocamltest_directory)/ocamltest$(EXE))) 54 54 55 - ocamltest := $(FLEXLINK_PREFIX) SORT=$(SORT) MAKE=$(MAKE) $(ocamltest_program) 55 + ifneq "$(FLEXLINK_PREFIX)" "" 56 + MKDLL=$(WINTOPDIR)/boot/ocamlrun $(WINTOPDIR)/flexdll/flexlink.exe \ 57 + $(FLEXLINK_FLAGS) 58 + endif 59 + ocamltest := $(FLEXLINK_PREFIX) MKDLL="$(MKDLL)" SORT=$(SORT) MAKE=$(MAKE) \ 60 + $(ocamltest_program) 56 61 57 62 .PHONY: default 58 63 default: