summaryrefslogtreecommitdiffstats
path: root/BaseTools/BinWrappers/PosixLike/UPT
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2018-03-14 10:58:34 +0100
committerLaszlo Ersek <lersek@redhat.com>2018-03-21 15:53:44 +0100
commitb12b2c74a3fbab681b76e33ca8d535dedf6c2b75 (patch)
tree0fd1a66790a96e8d0f71eb16005b5b9b7981a25f /BaseTools/BinWrappers/PosixLike/UPT
parent28892d768be4ad731d754fb13de58368d524fd14 (diff)
downloadedk2-b12b2c74a3fbab681b76e33ca8d535dedf6c2b75.tar.gz
edk2-b12b2c74a3fbab681b76e33ca8d535dedf6c2b75.tar.bz2
edk2-b12b2c74a3fbab681b76e33ca8d535dedf6c2b75.zip
BaseTools/PosixLike: honor pre-set PYTHONPATH
Utilities written in Python may depend on external (preinstalled) Python packages; for example, Ecc depends on "antlr_python_runtime-3.0.1". Such packages need not be installed system-wide, as long as they are reachable through PYTHONPATH. Therefore we shouldn't overwrite the user's PYTHONPATH with "BaseTools/Source/Python"; instead, we should prepend the latter to the former. Cc: Liming Gao <liming.gao@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=896 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/BinWrappers/PosixLike/UPT')
-rwxr-xr-xBaseTools/BinWrappers/PosixLike/UPT2
1 files changed, 1 insertions, 1 deletions
diff --git a/BaseTools/BinWrappers/PosixLike/UPT b/BaseTools/BinWrappers/PosixLike/UPT
index 214d88fff1..01ae23ddeb 100755
--- a/BaseTools/BinWrappers/PosixLike/UPT
+++ b/BaseTools/BinWrappers/PosixLike/UPT
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
dir=$(dirname "$full_cmd")
cmd=${full_cmd##*/}
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"