diff options
| author | rkfg <rkfg@rkfg.me> | 2017-11-14 13:01:50 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-14 22:35:06 +0200 |
| commit | 87bf152e6ef5fa1a29216ce4c4b3fd7362d04758 (patch) | |
| tree | 03fba81a2a5bd07605cb006940f8dfa1b61af89a /mesonbuild/compilers/compilers.py | |
| parent | c63b3d253d0f1173df16562b3fd47195c04e2997 (diff) | |
| download | meson-87bf152e6ef5fa1a29216ce4c4b3fd7362d04758.zip meson-87bf152e6ef5fa1a29216ce4c4b3fd7362d04758.tar.gz meson-87bf152e6ef5fa1a29216ce4c4b3fd7362d04758.tar.bz2 | |
Fix #2620
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 5a3c8d1..032ca69 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -833,7 +833,9 @@ class Compiler: paths = ':'.join([os.path.join('$ORIGIN', p) for p in rel_rpaths]) # Build_rpath is used as-is (it is usually absolute). if build_rpath != '': - paths += ':' + build_rpath + if paths != '': + paths += ':' + paths += build_rpath if len(paths) < len(install_rpath): padding = 'X' * (len(install_rpath) - len(paths)) if not paths: |