25 lines
995 B
Plaintext
25 lines
995 B
Plaintext
$OpenBSD: patch-Makefile_in,v 1.2 2010/12/07 14:57:19 dcoppa Exp $
|
|
--- Makefile.in.orig Mon Feb 5 22:10:29 2007
|
|
+++ Makefile.in Wed Nov 10 17:15:22 2010
|
|
@@ -115,7 +115,7 @@ $(OBJDIR)/cilly$(EXE) : $(CILLY_MODULES:%=$(OBJDIR)/%.
|
|
@$(NARRATIVE) "Linking $(COMPILETOWHAT) $@ $(LINKMSG)"
|
|
$(AT)$(CAMLLINK) -verbose -o $@ \
|
|
$(CILLY_LIBS:%=%.$(CMXA)) \
|
|
- $(CILLY_LIBS:%=-cclib -l%) \
|
|
+ $(unix camlstr -l%) \
|
|
$^
|
|
|
|
|
|
@@ -273,7 +273,10 @@ $(OBJDIR)/libperfcount.a: %: %($(OBJDIR)/perfcount.$(C
|
|
ifeq ($(NATIVECAML),1)
|
|
$(OBJDIR)/libcil.a: $(OCAML_CIL_LIB_CMODULES:%=$(OBJDIR)/lib%.a) \
|
|
$(OCAML_CIL_LIB_MODULES:%=$(OBJDIR)/%.$(CMO))
|
|
- ocamlopt -output-obj -o $@ $(CILLY_LIBS:%=%.cmxa) $^
|
|
+ ocamlopt -output-obj -o $(OBJDIR)/libcil.o unix.cmxa str.cmxa $^
|
|
+ rm -f $@
|
|
+ ar rcs $@ $(OBJDIR)/libcil.o
|
|
+ rm -f $(OBJDIR)/libcil.o
|
|
else
|
|
$(OBJDIR)/libcil.a:
|
|
@echo "Can only build $@ when NATIVECAML is 1."
|