unbreak after switching llvm-ranlib; it only takes one archive at a time

This commit is contained in:
robert 2022-03-24 14:39:17 +00:00
parent 036bebfcfa
commit af23240570
2 changed files with 16 additions and 2 deletions

View File

@ -0,0 +1,14 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -545,7 +545,9 @@ installoptopt:
"$(INSTALL_COMPLIBDIR)"; \
fi
cd "$(INSTALL_COMPLIBDIR)" && \
- $(RANLIB) ocamlcommon.$(A) ocamlbytecomp.$(A) ocamloptcomp.$(A)
+ $(RANLIB) ocamlcommon.$(A) && \
+ $(RANLIB) ocamlbytecomp.$(A) && \
+ $(RANLIB) ocamloptcomp.$(A)
# Installation of the *.ml sources of compiler-libs
.PHONY: install-compiler-sources

View File

@ -26,7 +26,7 @@ Index: configure.ac
rpath="-Wl,-rpath,"
mksharedlibrpath="-Wl,-rpath,"
natdynlinkopts="-Wl,-E"
@@ -864,6 +869,7 @@ AS_IF([test x"$enable_shared" != "xno"],
@@ -912,6 +917,7 @@ AS_IF([test x"$enable_shared" != "xno"],
[earm*-*-netbsd*], [natdynlink=true],
[aarch64-*-linux*], [natdynlink=true],
[aarch64-*-freebsd*], [natdynlink=true],
@ -34,7 +34,7 @@ Index: configure.ac
[riscv*-*-linux*], [natdynlink=true])])
# Try to work around the Skylake/Kaby Lake processor bug.
@@ -956,6 +962,8 @@ AS_CASE([$host],
@@ -1013,6 +1019,8 @@ AS_CASE([$host],
[arch=arm64; system=linux],
[aarch64-*-freebsd*],
[arch=arm64; system=freebsd],