diff options
| author | Carl Dong <contact@carldong.me> | 2020-11-09 15:57:32 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2020-11-09 16:58:28 -0500 |
| commit | 46756a69877ab7d56f3b05f8c5a8899eb24d9ffd (patch) | |
| tree | 66143d2cbe992b0d4078a83f6342f9d2b43bdfdf /depends/config.site.in | |
| parent | 618cbd2c1a630a60bed9212718dce78fe5f50108 (diff) | |
| download | bitcoin-46756a69877ab7d56f3b05f8c5a8899eb24d9ffd.tar.xz | |
depends: Fix PYTHONPATH setting in config.site.in
Previously, when running ./configure:
1. With CONFIG_SITE pointed to our depends config.site.in, and
2. PYTHONPATH was not set either in the environment or by the user
The configure would output something like:
PYTHONPATH='depends/x86_64-pc-linux-gnu/share/../native/lib/python3/dist-packages:'
When we really mean:
PYTHONPATH='depends/x86_64-pc-linux-gnu/share/../native/lib/python3/dist-packages'
...without the colon
This change makes sure that:
1. There's no trailing colon, and
2. We use the $PATH_SEPARATOR variable instead of a colon
Diffstat (limited to 'depends/config.site.in')
| -rw-r--r-- | depends/config.site.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/config.site.in b/depends/config.site.in index c39975ecde..f4531830c8 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -79,7 +79,7 @@ fi if test -n "@CXX@" -a -z "${CXX}"; then CXX="@CXX@" fi -PYTHONPATH=$depends_prefix/native/lib/python3/dist-packages:$PYTHONPATH +PYTHONPATH="${depends_prefix}/native/lib/python3/dist-packages${PYTHONPATH:+${PATH_SEPARATOR}}${PYTHONPATH}" if test -n "@AR@"; then AR=@AR@ |