From fd65ef00907710b3b036abf263516cfa872feb33 Mon Sep 17 00:00:00 2001 From: notin Date: Fri, 26 May 2006 14:53:36 +0000 Subject: Modification de la compilation de coqc et coqmktop pour éviter le problème de stripping automatique sous Fedora git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@8865 85f007b7-540e-0410-9357-904b9bb8a0f7 --- Makefile | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 013da22429..70e20ac72e 100644 --- a/Makefile +++ b/Makefile @@ -381,7 +381,13 @@ clean :: # Main targets (coqmktop, coqtop.opt, coqtop.byte) ########################################################################### +COQMKTOPBYTE=bin/coqmktop.byte$(EXE) +COQMKTOPOPT=bin/coqmktop.opt$(EXE) +BESTCOQMKTOP=bin/coqmktop.$(BEST)$(EXE) COQMKTOP=bin/coqmktop$(EXE) +COQCBYTE=bin/coqc.byte$(EXE) +COQCOPT=bin/coqc.opt$(EXE) +BESTCOQC=bin/coqc.$(BEST)$(EXE) COQC=bin/coqc$(EXE) COQTOPBYTE=bin/coqtop.byte$(EXE) COQTOPOPT=bin/coqtop.opt$(EXE) @@ -415,12 +421,21 @@ $(COQTOP): # coqmktop COQMKTOPCMO=$(CONFIG) scripts/tolink.cmo scripts/coqmktop.cmo +COQMKTOPCMX=config/coq_config.cmx scripts/tolink.cmx scripts/coqmktop.cmx -$(COQMKTOP): $(COQMKTOPCMO) +$(COQMKTOPBYTE): $(COQMKTOPCMO) $(SHOW)'OCAMLC -o $@' $(HIDE)$(OCAMLC) $(BYTEFLAGS) -o $@ -custom str.cma unix.cma \ $(COQMKTOPCMO) $(OSDEPLIBS) +$(COQMKTOPOPT): $(COQMKTOPCMX) + $(SHOW)'OCAMLOPT -o $@' + $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ str.cmxa unix.cmxa \ + $(COQMKTOPCMX) $(OSDEPLIBS) + +$(COQMKTOP): $(BESTCOQMKTOP) + cd bin; ln -sf coqmktop.$(BEST)$(EXE) coqmktop$(EXE) + scripts/tolink.ml: Makefile $(SHOW)"ECHO... >" $@ @@ -434,11 +449,20 @@ beforedepend:: scripts/tolink.ml # coqc COQCCMO=$(CONFIG) toplevel/usage.cmo scripts/coqc.cmo +COQCCMX=config/coq_config.cmx toplevel/usage.cmx scripts/coqc.cmx -$(COQC): $(COQCCMO) $(COQTOPBYTE) $(BESTCOQTOP) +$(COQCBYTE): $(COQCCMO) $(COQTOPBYTE) $(BESTCOQTOP) $(SHOW)'OCAMLC -o $@' $(HIDE)$(OCAMLC) $(BYTEFLAGS) -o $@ -custom unix.cma $(COQCCMO) $(OSDEPLIBS) +$(COQCOPT): $(COQCCMX) $(COQTOPOPT) $(BESTCOQTOP) + $(SHOW)'OCAMLOPT -o $@' + $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -o $@ unix.cmxa $(COQCCMX) $(OSDEPLIBS) + +$(COQC): $(BESTCOQC) + cd bin; ln -sf coqc.$(BEST)$(EXE) coqc$(EXE) + + clean:: rm -f scripts/tolink.ml -- cgit v1.2.3