Original bug ID: 613
Reporter: administrator
Status: closed
Resolution: fixed
Priority: normal
Severity: minor
Category: ~DO NOT USE (was: OCaml general)

Bug description

Hello,

In the cvs version of the compiler,
make world is stuck in the subdirectory otherlibs due to the fact that
ocamlmklib is called directly and not via boot/ocamlrun

I include the patch to otherlibs/*/Makefile's

Jacek Chrzaszcz

Index: otherlibs/bigarray/Makefile

RCS file: /caml/ocaml/otherlibs/bigarray/Makefile,v
retrieving revision 1.13
diff -a -u -r1.13 Makefile
--- otherlibs/bigarray/Makefile 2001/11/05 16:26:30 1.13
+++ otherlibs/bigarray/Makefile 2001/11/07 12:13:25
@@ -18,7 +18,7 @@
CFLAGS=-I../../byterun -g -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -I ../unix
CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../unix
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

C_OBJS=bigarray_stubs.o mmap_unix.o

Index: otherlibs/dbm/Makefile

RCS file: /caml/ocaml/otherlibs/dbm/Makefile,v
retrieving revision 1.18
diff -a -u -r1.18 Makefile
--- otherlibs/dbm/Makefile 2001/10/30 14:03:22 1.18
+++ otherlibs/dbm/Makefile 2001/11/07 12:13:25
@@ -20,7 +20,7 @@
CC=$(BYTECC) -g
CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib
CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

CFLAGS=$(DBM_INCLUDES) -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
COBJS=cldbm.o
Index: otherlibs/graph/Makefile

RCS file: /caml/ocaml/otherlibs/graph/Makefile,v
retrieving revision 1.29
diff -a -u -r1.29 Makefile
--- otherlibs/graph/Makefile 2001/10/30 09:32:31 1.29
+++ otherlibs/graph/Makefile 2001/11/07 12:13:25
@@ -20,7 +20,7 @@
CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib
CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

OBJS=open.o draw.o fill.o color.o text.o
image.o make_img.o dump_img.o point_col.o sound.o events.o
Index: otherlibs/labltk/support/Makefile.common

RCS file: /caml/ocaml/otherlibs/labltk/support/Makefile.common,v
retrieving revision 1.13
diff -a -u -r1.13 Makefile.common
--- otherlibs/labltk/support/Makefile.common 2001/10/03 06:34:56 1.13
+++ otherlibs/labltk/support/Makefile.common 2001/11/07 12:13:26
@@ -23,4 +23,4 @@

CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -labels
CAMLOPTLIBR=$(CAMLOPT) -a
-MKLIB=$(TOPDIR)/tools/ocamlmklib
+MKLIB=$(CAMLRUN) $(TOPDIR)/tools/ocamlmklib
Index: otherlibs/num/Makefile

RCS file: /caml/ocaml/otherlibs/num/Makefile,v
retrieving revision 1.24
diff -a -u -r1.24 Makefile
--- otherlibs/num/Makefile 2001/10/30 09:32:31 1.24
+++ otherlibs/num/Makefile 2001/11/07 12:13:27
@@ -21,7 +21,7 @@
CFLAGS=-O -I./bignum/h -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -w s
CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -w s
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

CAMLOBJS=int_misc.cmo string_misc.cmo nat.cmo big_int.cmo arith_flags.cmo
ratio.cmo num.cmo arith_status.cmo
Index: otherlibs/str/Makefile

RCS file: /caml/ocaml/otherlibs/str/Makefile,v
retrieving revision 1.25
diff -a -u -r1.25 Makefile
--- otherlibs/str/Makefile 2001/11/05 16:26:31 1.25
+++ otherlibs/str/Makefile 2001/11/07 12:13:28
@@ -23,7 +23,7 @@
CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
REGEXLIB=regex-0.12
COBJS=strstubs.o $(REGEXLIB)/regex.o
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

all: libstr.a str.cmi str.cma

Index: otherlibs/systhreads/Makefile

RCS file: /caml/ocaml/otherlibs/systhreads/Makefile,v
retrieving revision 1.29
diff -a -u -r1.29 Makefile
--- otherlibs/systhreads/Makefile 2001/10/30 09:32:31 1.29
+++ otherlibs/systhreads/Makefile 2001/11/07 12:13:28
@@ -16,7 +16,7 @@

CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -I ../unix
CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../unix
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

BYTECODE_C_OBJS=posix_b.o
NATIVECODE_C_OBJS=posix_n.o
Index: otherlibs/threads/Makefile

RCS file: /caml/ocaml/otherlibs/threads/Makefile,v
retrieving revision 1.40
diff -a -u -r1.40 Makefile
--- otherlibs/threads/Makefile 2001/11/05 16:26:31 1.40
+++ otherlibs/threads/Makefile 2001/11/07 12:13:29
@@ -17,7 +17,7 @@
CC=$(BYTECC)
CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -I ../unix
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

C_OBJS=scheduler.o

Index: otherlibs/unix/Makefile

RCS file: /caml/ocaml/otherlibs/unix/Makefile,v
retrieving revision 1.30
diff -a -u -r1.30 Makefile
--- otherlibs/unix/Makefile 2001/10/30 09:32:32 1.30
+++ otherlibs/unix/Makefile 2001/11/07 12:13:29
@@ -21,7 +21,7 @@
CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib
CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
-MKLIB=../../tools/ocamlmklib
+MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib

OBJS=accept.o access.o addrofstr.o alarm.o bind.o chdir.o chmod.o
chown.o chroot.o close.o closedir.o connect.o cst2constr.o cstringv.o \