diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2013-11-29 13:04:38 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2013-11-29 13:04:38 +0000 |
| commit | 33f242aaea3d761fb524c61855f677560c97069a (patch) | |
| tree | 8c4de14b223942cbea6c4e6a6d5ede38bb749807 /stdlib | |
| parent | 15da6d18042500c6e8f9698bf05bebcec456e9d3 (diff) | |
Reverting the elimination of the ocamlcomp*.sh scripts, namely the following commits:
14278
14277
14276
14176
14175
14173
14172
14171
14169
14168
14167
These changes need to mature on their own branch.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14329 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib')
| -rwxr-xr-x | stdlib/Makefile.shared | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/stdlib/Makefile.shared b/stdlib/Makefile.shared index bb2ef88fd..e9d5940a9 100755 --- a/stdlib/Makefile.shared +++ b/stdlib/Makefile.shared @@ -12,9 +12,12 @@ ######################################################################### include ../config/Makefile -CAMLC=$(CAMLC_BIN) +RUNTIME=../boot/ocamlrun +COMPILER=../ocamlc +CAMLC=$(RUNTIME) $(COMPILER) COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -nostdlib -CAMLOPT=$(CAMLOPT_BIN) +OPTCOMPILER=../ocamlopt +CAMLOPT=$(RUNTIME) $(OPTCOMPILER) OPTCOMPFLAGS=-warn-error A -nostdlib -g CAMLDEP=../boot/ocamlrun ../tools/ocamldep @@ -75,6 +78,12 @@ clean:: .ml.p.cmx: $(CAMLOPT) $(OPTCOMPFLAGS) `./Compflags $@` -p -c -o $*.p.cmx $< +# Dependencies on the compiler +$(OBJS) std_exit.cmo: $(COMPILER) +$(OBJS:.cmo=.cmi) std_exit.cmi: $(COMPILER) +$(OBJS:.cmo=.cmx) std_exit.cmx: $(OPTCOMPILER) +$(OBJS:.cmo=.p.cmx) std_exit.p.cmx: $(OPTCOMPILER) + # Dependencies on Pervasives (not tracked by ocamldep) $(OBJS) std_exit.cmo: pervasives.cmi $(OTHERS:.cmo=.cmi) std_exit.cmi: pervasives.cmi |