From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty Signed-off-by: Eric Le Bihan [Fix: remove leftover from original/unconditional code] Signed-off-by: Peter Seiderer --- mesonbuild/minstall.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py index 8ac6aab1..7ef04116 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py @@ -489,8 +489,14 @@ class Installer: printed_symlink_error = True if os.path.isfile(outname): try: - depfixer.fix_rpath(outname, install_rpath, final_path, - install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: + depfixer.fix_rpath(outname, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing") except SystemExit as e: if isinstance(e.code, int) and e.code == 0: pass -- 2.20.1