diff options
| author | letouzey | 2012-08-23 12:52:35 +0000 |
|---|---|---|
| committer | letouzey | 2012-08-23 12:52:35 +0000 |
| commit | 391ecb0090e2f1eb5e991accfd766459ba5d1829 (patch) | |
| tree | 308a87ba82db5b73240792fe180f8734ed401ce4 /Makefile.build | |
| parent | f4d8159fc0078b8cb2a8a666830f7e9983818ece (diff) | |
Port from 8.4 branch some build fixes concerning win32 :
r15722:
- CAMLBIN was cygwin-specific, leading to issues with coqmktop
- A missing Filename.quote on the temp file used in coqmktop
- Try to shorten the cmdline passed to Sys.command in coqmktop:
way too many includes were passed to coqmktop -boot
r15724: Coqmktop: the +compiler-libs for ocaml4 is back
r15725: Coqmktop: better detection of ocaml 4 and above
r15739: ocamlbuild : a missing include for camlp4
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15744 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile.build')
| -rw-r--r-- | Makefile.build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.build b/Makefile.build index 4fa0438fa1..907ce47c62 100644 --- a/Makefile.build +++ b/Makefile.build @@ -84,12 +84,15 @@ HIDE := $(if $(VERBOSE),,@) LOCALINCLUDES=$(addprefix -I , $(SRCDIRS) ) MLINCLUDES=$(LOCALINCLUDES) -I $(MYCAMLP4LIB) +COREMLINCLUDES=$(addprefix -I , $(CORESRCDIRS)) -I $(MYCAMLP4LIB) OCAMLC := $(TYPEREX) $(OCAMLC) $(CAMLFLAGS) OCAMLOPT := $(TYPEREX) $(OCAMLOPT) $(CAMLFLAGS) BYTEFLAGS=$(MLINCLUDES) $(CAMLDEBUG) $(USERFLAGS) OPTFLAGS=$(MLINCLUDES) $(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS) +COREBYTEFLAGS=$(COREMLINCLUDES) $(CAMLDEBUG) $(USERFLAGS) +COREOPTFLAGS=$(COREMLINCLUDES) $(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS) DEPFLAGS= -slash $(LOCALINCLUDES) define bestocaml @@ -203,12 +206,12 @@ states:: states/initial.coq $(COQTOPOPT): $(COQMKTOP) $(LINKCMX) $(LIBCOQRUN) $(SHOW)'COQMKTOP -o $@' - $(HIDE)$(COQMKTOP) -boot -opt $(OPTFLAGS) -o $@ + $(HIDE)$(COQMKTOP) -boot -opt $(COREOPTFLAGS) -o $@ $(STRIP) $@ $(COQTOPBYTE): $(COQMKTOP) $(LINKCMO) $(LIBCOQRUN) $(SHOW)'COQMKTOP -o $@' - $(HIDE)$(COQMKTOP) -boot -top $(BYTEFLAGS) -o $@ + $(HIDE)$(COQMKTOP) -boot -top $(COREBYTEFLAGS) -o $@ $(COQTOPEXE): $(ORDER_ONLY_SEP) $(BESTCOQTOP) cd bin; ln -sf coqtop.$(BEST)$(EXE) coqtop$(EXE) |