From ee70a80f70dfa1c942a130449cbc52f836c424c0 Mon Sep 17 00:00:00 2001
From: Nikos Gorogiannis <nikosg@fb.com>
Date: Mon, 7 Sep 2020 08:47:03 -0700
Subject: [PATCH] [models] install unconditionally

Summary: Since D20891116 (https://github.com/facebook/infer/commit/224e0b7c521f0e7ecdb524b6a5ab6fa056a2706d), java models are not installed at all if the C analyzers are not enabled.  The recent move of models into Sqlite (D23191601 (https://github.com/facebook/infer/commit/1db53f43b5ab41e4b4a3a5c6338d0a36e86b028f)) makes this a fatal error instead of a silent one.

Reviewed By: artempyanykh

Differential Revision: D23565074

fbshipit-source-id: 3816ac797
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9855d44c7..8c15c6baf 100644
--- a/Makefile
+++ b/Makefile
@@ -642,6 +642,8 @@ endif
 	test -d      '$(DESTDIR)$(libdir)/infer/infer/bin/' || \
 	  $(MKDIR_P) '$(DESTDIR)$(libdir)/infer/infer/bin/'
 # copy files
+	$(INSTALL_DATA) -C          'infer/lib/models.sql' \
+	  '$(DESTDIR)$(libdir)/infer/infer/lib/models.sql'
 ifeq ($(BUILD_C_ANALYZERS),yes)
 	$(INSTALL_DATA) -C          'facebook-clang-plugins/libtooling/build/FacebookClangPlugin.dylib' \
 	  '$(DESTDIR)$(libdir)/infer/facebook-clang-plugins/libtooling/build/FacebookClangPlugin.dylib'
@@ -659,8 +661,6 @@ ifeq ($(BUILD_C_ANALYZERS),yes)
 	  [ $(cc) -ef '$(INFER_BIN)' ] && \
 	  $(REMOVE) '$(notdir $(cc))' && \
 	  $(LN_S) ../../bin/infer '$(notdir $(cc))';))
-	$(INSTALL_DATA) -C          'infer/lib/models.sql' \
-	  '$(DESTDIR)$(libdir)/infer/infer/lib/models.sql'
 	$(INSTALL_DATA) -C          'infer/lib/linter_rules/linters.al' \
 	  '$(DESTDIR)$(libdir)/infer/infer/lib/linter_rules/linters.al'
 	$(INSTALL_DATA) -C          'infer/etc/clang_ast.dict' \