diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-05-17 12:03:58 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-05-17 12:03:58 +0000 |
| commit | 6283fee381455633f19a1cb32997107b497ec6f3 (patch) | |
| tree | 314619be9ca0ba4e902a86965e6f26fead1a4404 /testsuite/makefiles | |
| parent | 4f24f8ab0f1d21633ae3263b2d8f89bf1b92c118 (diff) | |
testsuite: making it work without installing OCaml (continued)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13690 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'testsuite/makefiles')
| -rw-r--r-- | testsuite/makefiles/Makefile.common | 5 | ||||
| -rw-r--r-- | testsuite/makefiles/Makefile.one | 2 | ||||
| -rw-r--r-- | testsuite/makefiles/Makefile.several | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/testsuite/makefiles/Makefile.common b/testsuite/makefiles/Makefile.common index f4c76b488..5f543c6fa 100644 --- a/testsuite/makefiles/Makefile.common +++ b/testsuite/makefiles/Makefile.common @@ -22,6 +22,7 @@ CYGPATH=echo DIFF=diff -q CANKILL=true SORT=sort +SET_LD_PATH=LD_LIBRARY_PATH="$(LD_PATH)" # The variables above may be overridden by .../config/Makefile # OTOPDIR is either TOPDIR or WINTOPDIR, whichever is appropriate for @@ -35,6 +36,10 @@ SORT=sort # and false for the mingw and MSVC ports. # SORT is the Unix "sort" command. Usually a simple command, but may be an # absolute name if the Windows "sort" command is in the PATH. +# SET_LD_PATH is a command prefix that sets the path for dynamic libraries +# (LD_LIBRARY_PATH for Unix, PATH for Windows) using the LD_PATH shell +# variable. Note that for Windows we add Unix-syntax directory names in +# PATH, and Cygwin will translate it to Windows syntax. include $(TOPDIR)/config/Makefile diff --git a/testsuite/makefiles/Makefile.one b/testsuite/makefiles/Makefile.one index e447336be..16d02e8e3 100644 --- a/testsuite/makefiles/Makefile.one +++ b/testsuite/makefiles/Makefile.one @@ -33,7 +33,7 @@ CC=$(NATIVECC) $(NATIVECCCOMPOPTS) .PHONY: default default: - @$(MAKE) compile run LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)" + @$(SET_LD_PATH) $(MAKE) compile run .PHONY: compile compile: $(ML_FILES) $(CMO_FILES) $(MAIN_MODULE).cmo diff --git a/testsuite/makefiles/Makefile.several b/testsuite/makefiles/Makefile.several index 03b508dd1..d4a5caac3 100644 --- a/testsuite/makefiles/Makefile.several +++ b/testsuite/makefiles/Makefile.several @@ -28,7 +28,7 @@ ADD_OPTFLAGS+=$(FORTRAN_LIB) .PHONY: check check: @if [ -n "$(FORTRAN_COMPILER)" -o -z "$(F_FILES)" ]; then \ - $(MAKE) run-all LD_LIBRARY_PATH="$(LD_LIBRARY_PATH)"; \ + $(SET_LD_PATH) $(MAKE) run-all; \ fi .PHONY: run-all |