From 9f616e98bf896ca28608b21d93a457f74da2de6b Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 23 May 2018 18:50:06 +0530 Subject: [PATCH] depfixer: Run install_name_tool only once while deleting rpaths --- mesonbuild/scripts/depfixer.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py index eb9937846..1d2cc609b 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: