From 4d7742fd68002ab10fe70d9d0d891ca84d561432 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Mon, 17 Jul 2017 06:53:13 -0700
Subject: [PATCH] [javac][wrapper] specify which infer binary to use

Summary:
The previous version
- assumed that `infer` was in `PATH`
- would pick any old `infer` in `PATH` and not necessarily the right version

Reviewed By: mbouaziz

Differential Revision: D5433624

fbshipit-source-id: a59be3d
---
 infer/lib/wrappers/javac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/infer/lib/wrappers/javac b/infer/lib/wrappers/javac
index 6dbeee1fb..89fe7dfe9 100755
--- a/infer/lib/wrappers/javac
+++ b/infer/lib/wrappers/javac
@@ -2,6 +2,8 @@
 
 # This is a wrapper for javac
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 if [ -z "$INFER_OLD_PATH" ]; then
     echo '$INFER_OLD_PATH with a copy of $PATH not provided.' > /dev/stderr
     exit 1
@@ -10,7 +12,8 @@ fi
 HOST_COMPILER=(`PATH="$INFER_OLD_PATH" which javac`)
 COMPILER_ARGS=("$@")
 HOST_COMPILER_COMMAND=("$HOST_COMPILER" "${COMPILER_ARGS[@]}")
-FRONTEND_COMMAND=("infer" "capture" "--continue" "--" "javac" "${COMPILER_ARGS[@]}")
+FRONTEND_COMMAND=("$SCRIPT_DIR/../../bin/infer" "capture" "--continue"
+                  "--" "javac" "${COMPILER_ARGS[@]}")
 
 if [[ "$*" == *-version* ]]; then
     exec "${HOST_COMPILER_COMMAND[@]}"