This commit is contained in:
John Whitington 2023-03-14 19:57:42 +00:00
parent 447f64c2b6
commit 0c37c488a4

View File

@ -333,7 +333,7 @@ ifndef REAL_OCAMLFIND
ifdef PACKS ifdef PACKS
ifndef CREATE_LIB ifndef CREATE_LIB
ifdef THREADS ifdef THREADS
PACKS += threads PACKS += threads
endif endif
endif endif
empty := empty :=
@ -683,7 +683,7 @@ ifndef REAL_OCAMLC
ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS) ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS)
ifndef CREATE_LIB ifndef CREATE_LIB
ifndef REAL_OCAMLFIND ifndef REAL_OCAMLFIND
ALL_LDFLAGS := $(ALL_LDFLAGS) ALL_LDFLAGS := unix.cma threads.cma $(ALL_LDFLAGS)
endif endif
endif endif
endif endif
@ -729,7 +729,7 @@ else
ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS) ALL_LDFLAGS := $(THREAD_FLAG) $(ALL_LDFLAGS)
ifndef CREATE_LIB ifndef CREATE_LIB
ifndef REAL_OCAMLFIND ifndef REAL_OCAMLFIND
ALL_LDFLAGS := $(ALL_LDFLAGS) ALL_LDFLAGS := unix.cmxa threads.cmxa $(ALL_LDFLAGS)
endif endif
endif endif
endif endif
@ -738,7 +738,7 @@ endif
export MAKE_DEPS export MAKE_DEPS
ifdef ANNOTATE ifdef ANNOTATE
ANNOT_FLAG := -annot ANNOT_FLAG := -annot -bin-annot
else else
endif endif
@ -1129,7 +1129,8 @@ endif
$(QUIET)if [ $(NOIDLHEADER) ]; then touch $*.h; fi $(QUIET)if [ $(NOIDLHEADER) ]; then touch $*.h; fi
%.$(EXT_OBJ): %.c %.$(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) \ $(CPPFLAGS) $(CPPFLAGS_WIN32) \
$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $< $(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<