From e830f516ce488dab7cf3f918bf0f739c9e2abcf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Czarnecki?= <pczarnecki@antmicro.com>
Date: Mon, 23 May 2022 15:34:41 +0200
Subject: [PATCH] wrappers: sh: ql: fix share path and add missing env vars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Paweł Czarnecki <pczarnecki@antmicro.com>
---
 f4pga/wrappers/sh/quicklogic/ql.f4pga.sh    | 4 +++-
 f4pga/wrappers/sh/quicklogic/synth.f4pga.sh | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/f4pga/wrappers/sh/quicklogic/ql.f4pga.sh b/f4pga/wrappers/sh/quicklogic/ql.f4pga.sh
index 26328ae..1bfee36 100755
--- a/f4pga/wrappers/sh/quicklogic/ql.f4pga.sh
+++ b/f4pga/wrappers/sh/quicklogic/ql.f4pga.sh
@@ -20,7 +20,9 @@ set -e
 
 BUILDDIR=build
 
-source "$F4PGA_ENV_BIN"/vpr_common
+SHARE_DIR_PATH=${SHARE_DIR_PATH:="$F4PGA_ENV_SHARE"}
+
+source $(dirname "$0")/vpr_common.f4pga.sh
 
 VERSION="v2.0.1"
 
diff --git a/f4pga/wrappers/sh/quicklogic/synth.f4pga.sh b/f4pga/wrappers/sh/quicklogic/synth.f4pga.sh
index 9c0b98f..88c29ac 100755
--- a/f4pga/wrappers/sh/quicklogic/synth.f4pga.sh
+++ b/f4pga/wrappers/sh/quicklogic/synth.f4pga.sh
@@ -134,9 +134,13 @@ export SYNTH_JSON=${TOP}_io.json
 export OUT_SYNTH_V=${TOP}_synth.v
 export OUT_EBLIF=${TOP}.eblif
 export OUT_FASM_EXTRA=${TOP}_fasm_extra.fasm
+export PYTHON3=$(which python3)
+export UTILS_PATH=${VPRPATH}/python/
 
 if [ -s $PCF ]; then
     export PCF_FILE=$PCF
+else
+    export PCF_FILE=""
 fi
 
 DEVICE_PATH="${SHARE_DIR_PATH}/arch/${DEVICE}_${DEVICE}"