diff options
| -rw-r--r-- | Makefile.build | 5 | ||||
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | config/Makefile.template | 1 | ||||
| -rwxr-xr-x | configure | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.build b/Makefile.build index 658abcf5c..0a60e4bb8 100644 --- a/Makefile.build +++ b/Makefile.build @@ -137,10 +137,11 @@ endif CINCLUDES= -I $(CAMLHLIB) -# libcoqrun.a +# libcoqrun.a, dllcoqrun.so $(LIBCOQRUN): kernel/byterun/coq_jumptbl.h $(BYTERUN) - $(AR) rc $(LIBCOQRUN) $(BYTERUN) + cd $(dir $(LIBCOQRUN)) && \ + $(OCAMLMKLIB) -oc $(COQRUN) $(foreach u,$(BYTERUN),$(notdir $(u))) $(RANLIB) $(LIBCOQRUN) #coq_jumptbl.h is required only if you have GCC 2.0 or later diff --git a/Makefile.common b/Makefile.common index 08ae6f835..5c8c28cd3 100644 --- a/Makefile.common +++ b/Makefile.common @@ -111,7 +111,9 @@ REFMANPNGFILES:=$(REFMANEPSFILES:.eps=.png) # Object and Source files ########################################################################### -LIBCOQRUN:=kernel/byterun/libcoqrun.a +COQRUN := coqrun +LIBCOQRUN:=kernel/byterun/lib$(COQRUN).a +DLLCOQRUN:=$(dir $(LIBCOQRUN))dll$(COQRUN).so CLIBS:=unix.cma diff --git a/config/Makefile.template b/config/Makefile.template index fc8af173f..a48bbceb9 100644 --- a/config/Makefile.template +++ b/config/Makefile.template @@ -58,6 +58,7 @@ COQIDEINCLUDES=LABLGTKINCLUDES # Objective-Caml compile command OCAML="OCAMLEXEC" OCAMLC="BYTECAMLC" +OCAMLMKLIB="OCAMLMKLIBEXEC" OCAMLOPT="NATIVECAMLC" OCAMLDEP="OCAMLDEPEXEC" OCAMLDOC="OCAMLDOCEXEC" @@ -83,6 +83,7 @@ usage () { # Default OCaml binaries bytecamlc=ocamlc nativecamlc=ocamlopt +ocamlmklib=ocamlmklib ocamlexec=ocaml ocamldepexec=ocamldep ocamldocexec=ocamldoc @@ -937,6 +938,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \ -e "s|BESTCOMPILER|$best_compiler|" \ -e "s|EXECUTEEXTENSION|$EXE|" \ -e "s|BYTECAMLC|$bytecamlc|" \ + -e "s|OCAMLMKLIBEXEC|$ocamlmklib|" \ -e "s|NATIVECAMLC|$nativecamlc|" \ -e "s|OCAMLEXEC|$ocamlexec|" \ -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ |