summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2017-08-19 17:44:26 +0200
committerXavier Leroy <xavier.leroy@inria.fr>2017-08-19 17:44:26 +0200
commit3de0115bfec4c217f2ee837f5a838ad82d2148da (patch)
tree311f10179dfe01b992c4ad97d92a89bc9ea05d46
parentae63ae456f4371e341867411821cba41c41b52f5 (diff)
downloadocaml-3de0115bfec4c217f2ee837f5a838ad82d2148da.tar.gz
At installation time, remove some leftover files from otherlibs/num
In $(INSTALL_LIBDIR) there can be leftover files from an earlier installation of OCaml, including files from the now defunct otherlibs/num library. Those files can cause findlib/ocamlfind to think that the Num library is still provided by the core OCaml distribution. This is a temporary hack, to be cleaned up in 4.07 for example.
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f63fecc2b8..1a42ec7969 100644
--- a/Makefile
+++ b/Makefile
@@ -635,6 +635,10 @@ endif
for i in $(OTHERLIBRARIES); do \
$(MAKE) -C otherlibs/$$i install || exit $$?; \
done
+# Transitional: findlib 1.7.3 is confused if leftover num.cm? files remain
+# from an previous installation of OCaml before otherlibs/num was removed.
+ rm -f "$(INSTALL_LIBDIR)"/num.cm?
+# End transitional
if test -n "$(WITH_OCAMLDOC)"; then \
$(MAKE) -C ocamldoc install; \
fi