diff options
Diffstat (limited to 'testsuite/makefiles/Makefile.several')
| -rw-r--r-- | testsuite/makefiles/Makefile.several | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/makefiles/Makefile.several b/testsuite/makefiles/Makefile.several index d3cf3b1e59..3482e3af30 100644 --- a/testsuite/makefiles/Makefile.several +++ b/testsuite/makefiles/Makefile.several @@ -20,7 +20,7 @@ O_FILES=$(C_FILES:=.o) CUSTOM_FLAG=`if [ -n "$(C_FILES)" ]; then echo '-custom'; fi` ADD_CFLAGS+=$(CUSTOM_FLAG) -MYRUNTIME=`if [ -z "$(C_FILES)" ]; then echo '$(OCAMLRUN)'; fi` +MYRUNTIME=`if [ -z "$(C_FILES)$(CUSTOM)" ]; then echo '$(OCAMLRUN)'; fi` FORTRAN_LIB=`if [ -n "$(F_FILES)" ]; then echo '$(FORTRAN_LIBRARY)'; fi` ADD_CFLAGS+=$(FORTRAN_LIB) ADD_OPTFLAGS+=$(FORTRAN_LIB) @@ -44,7 +44,7 @@ run-all: CANKILL=$(CANKILL) sh `basename $$file ml`precheck || continue; \ fi; \ printf " ... testing '$$file':"; \ - $(MAKE) run-file DESC=ocamlc COMP="$(OCAMLC)" \ + $(MAKE) run-file DESC=ocamlc COMP='$(OCAMLC)' \ RUNTIME='$(MYRUNTIME)' \ COMPFLAGS='-w a $(ADD_COMPFLAGS) $(ADD_CFLAGS) $(O_FILES) \ $(CMA_FILES) -I $(OTOPDIR)/testsuite/lib \ @@ -52,7 +52,7 @@ run-all: FILE=$$file PROGRAM_ARGS=$(PROGRAM_ARGS) \ && \ if $(BYTECODE_ONLY); then : ; else \ - $(MAKE) run-file DESC=ocamlopt COMP="$(OCAMLOPT)" \ + $(MAKE) run-file DESC=ocamlopt COMP='$(OCAMLOPT)' \ RUNTIME= \ COMPFLAGS='-w a $(ADD_COMPFLAGS) $(ADD_OPTFLAGS) \ $(O_FILES) $(CMXA_FILES) \ @@ -61,7 +61,7 @@ run-all: fi \ && \ if [ -n "$(UNSAFE)" ]; then \ - $(MAKE) run-file DESC=ocamlc-unsafe COMP="$(OCAMLC)" \ + $(MAKE) run-file DESC=ocamlc-unsafe COMP='$(OCAMLC)' \ RUNTIME='$(MYRUNTIME)' \ COMPFLAGS='-w a -unsafe $(ADD_COMPFLAGS) $(ADD_CFLAGS) \ $(O_FILES) $(CMA_FILES) \ @@ -69,7 +69,7 @@ run-all: FILE=$$file \ && \ if $(BYTECODE_ONLY); then : ; else \ - $(MAKE) run-file DESC=ocamlopt-unsafe COMP="$(OCAMLOPT)" \ + $(MAKE) run-file DESC=ocamlopt-unsafe COMP='$(OCAMLOPT)' \ RUNTIME= \ COMPFLAGS='-w a -unsafe $(ADD_COMPFLAGS) $(ADD_OPTFLAGS)\ $(O_FILES) $(CMXA_FILES) \ |