From bbea6513ead059f9598422235b575065d9fb22ab Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 28 Sep 2020 12:47:14 +0200 Subject: [PATCH] avoid appending lib stubs pattern to RPATH filter over and over again --- easybuild/tools/toolchain/toolchain.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/easybuild/tools/toolchain/toolchain.py b/easybuild/tools/toolchain/toolchain.py index 1b3819b341..53d46ab2b9 100644 --- a/easybuild/tools/toolchain/toolchain.py +++ b/easybuild/tools/toolchain/toolchain.py @@ -953,7 +953,9 @@ def prepare_rpath_wrappers(self, rpath_filter_dirs=None, rpath_include_dirs=None # always include filter for 'stubs' library directory, # cfr. https://github.com/easybuilders/easybuild-framework/issues/2683 - rpath_filter_dirs.append('.*/lib(64)?/stubs/?') + lib_stubs_pattern = '.*/lib(64)?/stubs/?' + if lib_stubs_pattern not in rpath_filter_dirs: + rpath_filter_dirs.append(lib_stubs_pattern) # directory where all wrappers will be placed wrappers_dir = os.path.join(tempfile.mkdtemp(), RPATH_WRAPPERS_SUBDIR)