From 078ae7e907833767731171912f39a106a4b56369 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Tue, 10 Oct 2017 15:20:10 +0200
Subject: [PATCH] 8188910: jib configure requires --src-dir for out fo tree
 builds, second attempt

Reviewed-by: dholmes, tbell, ihse
---
 bin/jib.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/jib.sh b/bin/jib.sh
index 1adec9b0b45..aab198990cc 100644
--- a/bin/jib.sh
+++ b/bin/jib.sh
@@ -39,7 +39,7 @@ setup_url() {
     jib_repository="jdk-virtual"
     jib_organization="jpg/infra/builddeps"
     jib_module="jib"
-    jib_revision="2.0-SNAPSHOT"
+    jib_revision="3.0-SNAPSHOT"
     jib_ext="jib.sh.gz"
 
     closed_script="${mydir}/../../closed/make/conf/jib-install.conf"
@@ -146,4 +146,9 @@ elif [ ! -e "${install_data}" ] || [ "${data_string}" != "$(cat "${install_data}
     install_jib
 fi
 
+# Provide a reasonable default for the --src-dir parameter if run out of tree
+if [ -z "${JIB_SRC_DIR}" ]; then
+    export JIB_SRC_DIR="${mydir}/../"
+fi
+
 ${installed_jib_script} "$@"