- Fix build with ocaml 3.12.

This commit is contained in:
Stanislav Sedov 2011-04-04 09:08:11 +00:00
parent bb997f64d0
commit 02c38b36a1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=272191
2 changed files with 29 additions and 3 deletions

View file

@ -1,6 +1,15 @@
--- Makefile.in.orig 2010-09-29 06:56:25.000000000 +0000
+++ Makefile.in 2010-10-24 23:00:14.000000000 +0000
@@ -60,7 +60,7 @@ BIB2BIBOBJS = options.cmx bibtex.cmx bib
--- Makefile.in.orig 2010-09-28 23:56:25.000000000 -0700
+++ Makefile.in 2011-04-04 02:06:08.000000000 -0700
@@ -45,7 +45,7 @@
FLAGS = $(ZLIBS) $(DEBUG)
PROFILE =
-STRLIB = -cclib -lstr
+STRLIB =
OBJS = options.cmx html.cmx latexmacros.cmx latexscan.cmx bbl_lexer.cmx \
bibtex.cmx bibtex_parser.cmx bibtex_lexer.cmx \
@@ -60,7 +60,7 @@
bibfilter.cmx latexmacros.cmx latexscan.cmx expand.cmx \
html.cmx biboutput.cmx version.cmx copying.cmx bib2bib.cmx

View file

@ -0,0 +1,17 @@
--- compiler/Makefile.orig 2011-04-04 02:08:25.000000000 -0700
+++ compiler/Makefile 2011-04-04 02:08:42.000000000 -0700
@@ -37,12 +37,12 @@
$(PROG).bin: $(BINOBJS)
$(CAMLBIN) -o $(PROG).bin str.cmxa unix.cmxa $(BINOBJS) \
- -cclib -lunix -cclib -lstr && \
+ && \
$(RM) $(PROG) && ln -s $(PROG).bin $(PROG)
$(PROG).byt: $(BYTOBJS)
$(CAMLBYT) -g -custom -o $(PROG).byt str.cma unix.cma $(BYTOBJS) \
- -cclib -lunix -cclib -lstr && \
+ && \
$(RM) $(PROG) && ln -s $(PROG).byt $(PROG)
installbyt: