diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-29 11:05:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-29 11:05:44 -0400 |
| commit | c3f59d781d1610ddbeee348da86f88a6b52b97b8 (patch) | |
| tree | 7baae88d3444f173687d26ab05dfa5e908edace3 /mesonbuild/compilers | |
| parent | bcb2556c69eddd3e34fbe89f36a23ae8821c682d (diff) | |
| parent | 1d7c7a7ea6ef52b307dbc99fe63f9818f0521c00 (diff) | |
| download | meson-c3f59d781d1610ddbeee348da86f88a6b52b97b8.zip meson-c3f59d781d1610ddbeee348da86f88a6b52b97b8.tar.gz meson-c3f59d781d1610ddbeee348da86f88a6b52b97b8.tar.bz2 | |
Merge pull request #1926 from trhd/libbug
Fix a missing path issue causing Python traceback.
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 579988f..6b5c4a4 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -763,6 +763,10 @@ class Compiler: # directory. This breaks reproducible builds. rel_rpaths = [] for p in rpath_paths: + # p can be an empty string for build_dir (relative path), but + # os.path.relpath() below won't like that. + if p == '': + p = build_dir if p == from_dir: relative = '' # relpath errors out in this case else: |