From 7221c93980c76727f600090c2955a1ae85ae84f6 Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Fri, 12 Jun 2020 02:55:44 -0700 Subject: [PATCH] ship with libsqlite too Summary: Hopefully solve issues with people having versions of sqlite that make infer crash. Fix #1081. Reviewed By: skcho Differential Revision: D21998757 fbshipit-source-id: 4baabc1c3 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 27ee1b9bb..80febe6b1 100644 --- a/Makefile +++ b/Makefile @@ -723,11 +723,11 @@ install-with-libs: install ifneq ($(LDD),no) ifneq ($(PATCHELF),no) # this sort of assumes Linux -# figure out where libgmp and libmpfr are using ldd +# figure out where libgmp, libmpfr, and libsqlite3 are using ldd set -x; \ for lib in $$($(LDD) $(INFER_BIN) \ | cut -d ' ' -f 3 \ - | grep -e 'lib\(gmp\|mpfr\)'); do \ + | grep -e 'lib\(gmp\|mpfr\|sqlite\)'); do \ $(INSTALL_PROGRAM) -C "$$lib" '$(DESTDIR)$(libdir)'/infer/infer/libso/; \ done # update rpath of executables @@ -745,12 +745,12 @@ else # ldd not found ifneq ($(OTOOL),no) ifneq ($(INSTALL_NAME_TOOL),no) # this sort of assumes osx -# figure out where libgmp and libmpfr are using otool +# figure out where libgmp, libmpfr, and libsqlite3 are using otool set -e; \ set -x; \ for lib in $$($(OTOOL) -L $(INFER_BIN) \ | cut -d ' ' -f 1 | tr -d '\t' \ - | grep -e 'lib\(gmp\|mpfr\)'); do \ + | grep -e 'lib\(gmp\|mpfr\|sqlite\)'); do \ $(INSTALL_PROGRAM) -C "$$lib" '$(DESTDIR)$(libdir)'/infer/infer/libso/; \ done set -x; \