diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2014-04-17 09:49:33 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2014-04-17 09:49:33 +0000 |
commit | 65d56e7164265566b4aecd32470a4be2eb4d8e98 (patch) | |
tree | 97dfb991ee1598df5b9127284177499b20bc6755 /stdlib | |
parent | 3e9a3ad147cf42155a6581b0de077d61a8d4776b (diff) |
merge COMPFLAGS and OPTCOMPFLAGS
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14621 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib')
-rwxr-xr-x | stdlib/Makefile.shared | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stdlib/Makefile.shared b/stdlib/Makefile.shared index 1de2b7305..e4fee75d3 100755 --- a/stdlib/Makefile.shared +++ b/stdlib/Makefile.shared @@ -18,7 +18,6 @@ CAMLC=$(RUNTIME) $(COMPILER) COMPFLAGS=-strict-sequence -w +33..39 -g -warn-error A -bin-annot -nostdlib OPTCOMPILER=../ocamlopt CAMLOPT=$(RUNTIME) $(OPTCOMPILER) -OPTCOMPFLAGS=-warn-error A -nostdlib -g -bin-annot CAMLDEP=../boot/ocamlrun ../tools/ocamldep OBJS=pervasives.cmo $(OTHERS) @@ -75,10 +74,10 @@ clean:: $(CAMLC) $(COMPFLAGS) `./Compflags $@` -c $< .ml.cmx: - $(CAMLOPT) $(OPTCOMPFLAGS) `./Compflags $@` -c $< + $(CAMLOPT) $(COMPFLAGS) `./Compflags $@` -c $< .ml.p.cmx: - $(CAMLOPT) $(OPTCOMPFLAGS) `./Compflags $@` -p -c -o $*.p.cmx $< + $(CAMLOPT) $(COMPFLAGS) `./Compflags $@` -p -c -o $*.p.cmx $< # Dependencies on the compiler $(OBJS) std_exit.cmo: $(COMPILER) |