diff options
| author | Alain Frisch <alain@frisch.fr> | 2007-10-30 16:06:41 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2007-10-30 16:06:41 +0000 |
| commit | 9759334c0a02b19522f4a7f23d3a71edd754fe1e (patch) | |
| tree | 81835260494bef0cf8e1768e2e1f3fb526a082a2 | |
| parent | 004baf7af22b9f62208cc34f220b2d769d64328f (diff) | |
| download | ocaml-9759334c0a02b19522f4a7f23d3a71edd754fe1e.tar.gz | |
Use flexdll's -where option.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/natdynlink@8464 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | VERSION | 7 | ||||
| -rw-r--r-- | byterun/Makefile.nt | 3 | ||||
| -rw-r--r-- | config/Makefile.mingw | 7 | ||||
| -rw-r--r-- | config/Makefile.msvc | 8 | ||||
| -rwxr-xr-x | configure | 2 |
5 files changed, 14 insertions, 13 deletions
@@ -1,6 +1 @@ -3.10.0 - -# The version string is the first line of this file. -# It must be in the format described in stdlib/sys.mli - -# $Id$ +3.10.0 (natdynlink) diff --git a/byterun/Makefile.nt b/byterun/Makefile.nt index fceebcb2b9..4016b269ac 100644 --- a/byterun/Makefile.nt +++ b/byterun/Makefile.nt @@ -16,7 +16,8 @@ include ../config/Makefile CC=$(BYTECC) -CFLAGS=-DOCAML_STDLIB_DIR='"$(LIBDIR)"' -I../../flexdll/ +CFLAGS=-DOCAML_STDLIB_DIR='"$(LIBDIR)"' $(FLEXLINK) + COMMONOBJS=interp.o misc.o stacks.o fix_code.o startup.o \ fail.o signals.o signals_byt.o freelist.o major_gc.o minor_gc.o \ diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 1520336018..118bcc6785 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -17,8 +17,7 @@ ######### General configuration -#PREFIX=C:/ocamlmgw -PREFIX=C:/cygwin/home/frisch/natdynlink_ins_mingw +PREFIX=C:/ocamlmgw ### Where to install the binaries BINDIR=$(PREFIX)/bin @@ -95,6 +94,10 @@ NATIVECCLIBS= ### How to invoke the C preprocessor CPP=$(BYTECC) -E +### Path to the FlexDLL includes +FLEXDIR=$(shell flexlink -where) +FLEXLINK=-I"$(FLEXDIR)" + ### How to build an EXE MKEXE=flexlink -merge-manifest -chain mingw -exe -o $(1) $(2) -- $(3) #ml let mkexe out files opts = Printf.sprintf "flexlink -merge-manifest -chain mingw -exe -o %s %s -- %s" out files opts;; diff --git a/config/Makefile.msvc b/config/Makefile.msvc index 470d254901..47ebd9d101 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -17,9 +17,7 @@ ######### General configuration -#PREFIX=C:/ocamlms -PREFIX=C:/cygwin/home/frisch/natdynlink_ins_win32 - +PREFIX=C:/ocamlms ### Where to install the binaries. BINDIR=$(PREFIX)/bin @@ -95,6 +93,10 @@ NATIVECCLIBS=advapi32.lib ### How to invoke the C preprocessor CPP=cl /nologo /EP +### Path to the FlexDLL includes +FLEXDIR=$(shell flexlink -where) +FLEXLINK=-I"$(FLEXDIR)" + ### How to build an EXE MKEXE=flexlink -merge-manifest -exe -o $(1) $(2) -- $(3) #ml let mkexe out files opts = Printf.sprintf "flexlink -merge-manifest -exe -o %s %s -- %s" out files opts;; @@ -499,7 +499,7 @@ if test $withsharedlibs = "yes"; then cmxs="cmxs" case "$host" in *-*-cygwin*) - flexlink="-I`which flexlink | xargs dirname`" + flexlink="-I`flexlink -where`" mksharedlib="flexlink -chain cygwin -o" shared_libraries_supported=true;; *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-gnu*) |