From 0c37c488a44fe9eaaede64ab4716a90a1261e533 Mon Sep 17 00:00:00 2001
From: John Whitington <john@coherentgraphics.co.uk>
Date: Tue, 14 Mar 2023 19:57:42 +0000
Subject: [PATCH] more

---
 OCamlMakefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/OCamlMakefile b/OCamlMakefile
index a3078e9..3968988 100644
--- a/OCamlMakefile
+++ b/OCamlMakefile
@@ -333,7 +333,7 @@ ifndef REAL_OCAMLFIND
   ifdef PACKS
     ifndef CREATE_LIB
       ifdef THREADS
-	PACKS += threads
+        PACKS += threads
       endif
     endif
     empty :=
@@ -683,7 +683,7 @@ ifndef REAL_OCAMLC
     ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS)
     ifndef CREATE_LIB
       ifndef REAL_OCAMLFIND
-        ALL_LDFLAGS := $(ALL_LDFLAGS)
+        ALL_LDFLAGS := unix.cma threads.cma $(ALL_LDFLAGS)
       endif
     endif
   endif
@@ -729,7 +729,7 @@ else
     ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS)
     ifndef CREATE_LIB
       ifndef REAL_OCAMLFIND
-        ALL_LDFLAGS := $(ALL_LDFLAGS)
+        ALL_LDFLAGS := unix.cmxa threads.cmxa $(ALL_LDFLAGS)
       endif
     endif
   endif
@@ -738,7 +738,7 @@ endif
 export MAKE_DEPS
 
 ifdef ANNOTATE
-  ANNOT_FLAG := -annot
+  ANNOT_FLAG := -annot -bin-annot
 else
 endif
 
@@ -1129,7 +1129,8 @@ endif
 			$(QUIET)if [ $(NOIDLHEADER) ]; then touch $*.h; fi
 
 %.$(EXT_OBJ):	%.c
-			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
+			$(REAL_OCAMLFIND) $(REAL_OCAMLC) $(THREAD_FLAG) $(OCAML_FIND_PACKAGES) \
+				-c -cc "$(CC)" $(INCFLAGS) -ccopt "$(CFLAGS) \
 				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
 				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<