From 3edbde3fe2706fdff8dea3cb92416b1f50664e59 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Thu, 18 Oct 2018 18:26:34 -0700 Subject: [PATCH] Add FASM library to prjxray path. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- .gitmodules | 3 +++ third_party/fasm | 1 + utils/environment.sh | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 third_party/fasm diff --git a/.gitmodules b/.gitmodules index 96944e6e..62e557c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "third_party/yaml-cpp"] path = third_party/yaml-cpp url = https://github.com/jbeder/yaml-cpp.git +[submodule "third_party/fasm"] + path = third_party/fasm + url = https://github.com/SymbiFlow/fasm.git diff --git a/third_party/fasm b/third_party/fasm new file mode 160000 index 00000000..faed2f5e --- /dev/null +++ b/third_party/fasm @@ -0,0 +1 @@ +Subproject commit faed2f5e9915497c3774ec201ced8dc017cc03ae diff --git a/utils/environment.sh b/utils/environment.sh index 375c5f15..5545f727 100644 --- a/utils/environment.sh +++ b/utils/environment.sh @@ -4,7 +4,7 @@ while [ -h "$XRAY_ENV_PATH" ]; do # resolve $XRAY_ENV_PATH until the file is no XRAY_ENV_PATH="$(readlink "$XRAY_ENV_PATH")" [[ $XRAY_ENV_PATH != /* ]] && XRAY_ENV_PATH="$XRAY_UTILS_DIR/$XRAY_ENV_PATH" # if $XRAY_ENV_PATH was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -export PYTHONPATH="${XRAY_DIR}:$PYTHONPATH" +export PYTHONPATH="${XRAY_DIR}:${XRAY_DIR}/third_party/fasm:$PYTHONPATH" export XRAY_UTILS_DIR="$( cd -P "$( dirname "$XRAY_ENV_PATH" )" && pwd )" export XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )"