diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-23 18:50:06 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-05-24 14:38:28 +0000 |
| commit | 9f616e98bf896ca28608b21d93a457f74da2de6b (patch) | |
| tree | 424e0c447477d2f9f5feb05a1a7d5eab2fc247d1 | |
| parent | a6c9f98c57e8f42517d41d4c46ccf40163b6e7c6 (diff) | |
| download | meson-9f616e98bf896ca28608b21d93a457f74da2de6b.zip meson-9f616e98bf896ca28608b21d93a457f74da2de6b.tar.gz meson-9f616e98bf896ca28608b21d93a457f74da2de6b.tar.bz2 | |
depfixer: Run install_name_tool only once while deleting rpaths
| -rw-r--r-- | mesonbuild/scripts/depfixer.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py index eb99378..1d2cc60 100644 --- a/mesonbuild/scripts/depfixer.py +++ b/mesonbuild/scripts/depfixer.py @@ -372,8 +372,11 @@ def fix_darwin(fname, new_rpath): # non-executable target. Just return. return try: - for rp in rpaths: - subprocess.check_call(['install_name_tool', '-delete_rpath', rp, fname], + if rpaths: + args = [] + for rp in rpaths: + args += ['-delete_rpath', rp] + subprocess.check_call(['install_name_tool', fname] + args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) if new_rpath: |