From 13de8a0835ac3cf04c92dc73b2602e6aa0ece29e Mon Sep 17 00:00:00 2001
From: Dulma Churchill <dulmarod@fb.com>
Date: Tue, 6 Sep 2016 02:48:12 -0700
Subject: [PATCH] Fix cpp models that got broken by an incorrect refactoring

Reviewed By: jberdine

Differential Revision: D3819759

fbshipit-source-id: aa577dc
---
 infer/src/backend/config.ml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/infer/src/backend/config.ml b/infer/src/backend/config.ml
index 30dc6ec13..4eb163f97 100644
--- a/infer/src/backend/config.ml
+++ b/infer/src/backend/config.ml
@@ -232,17 +232,18 @@ let version_string =
     Unix.time *)
 let initial_analysis_time = Unix.time ()
 
+let bin_dir =
+  Filename.dirname Sys.executable_name
+
 let lib_dir =
-  let bin_dir = Filename.dirname Sys.executable_name in
-  let lib_dir = bin_dir // Filename.parent_dir_name // "lib" in
-  lib_dir
+  bin_dir // Filename.parent_dir_name // "lib"
 
 (** Path to lib/specs to retrieve the default models *)
 let models_dir =
   lib_dir // specs_dir_name
 
 let cpp_models_dir =
-  lib_dir // "models" // "cpp" // "include"
+  bin_dir // Filename.parent_dir_name // "models" // "cpp" // "include"
 
 let wrappers_dir =
   lib_dir // "wrappers"