From 87bf152e6ef5fa1a29216ce4c4b3fd7362d04758 Mon Sep 17 00:00:00 2001 From: rkfg Date: Tue, 14 Nov 2017 13:01:50 +0300 Subject: Fix #2620 --- mesonbuild/compilers/compilers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mesonbuild/compilers/compilers.py') 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: -- cgit v1.1