Skip to content

Commit 64a4b19

Browse files
committed
remove --rpath-wrappers-dir configuration option
1 parent ef951d9 commit 64a4b19

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

easybuild/framework/easyblock.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2902,13 +2902,12 @@ def prepare_step(self, start_dir=True, load_tc_deps_modules=True):
29022902
])
29032903

29042904
# Location to store RPATH wrappers
2905-
self.rpath_wrappers_dir = build_option('rpath_wrappers_dir')
29062905
if self.rpath_wrappers_dir is not None:
29072906
# Verify the path given is absolute
29082907
if os.path.isabs(self.rpath_wrappers_dir):
2909-
_log.debug("Using %s to store/use RPATH wrappers" % self.rpath_wrappers_dir)
2908+
_log.info(f"Using {self.rpath_wrappers_dir} to store/use RPATH wrappers")
29102909
else:
2911-
raise EasyBuildError("Path used for rpath_wrappers_dir is not an absolute path: %s", path)
2910+
raise EasyBuildError(f"Path used for rpath_wrappers_dir is not an absolute path: {path}")
29122911

29132912
if self.iter_idx > 0:
29142913
# reset toolchain for iterative runs before preparing it again
@@ -2925,9 +2924,11 @@ def prepare_step(self, start_dir=True, load_tc_deps_modules=True):
29252924
self.modules_tool.prepend_module_path(full_mod_path)
29262925

29272926
# prepare toolchain: load toolchain module and dependencies, set up build environment
2928-
self.toolchain.prepare(self.cfg['onlytcmod'], deps=self.cfg.dependencies(), silent=self.silent,
2929-
loadmod=load_tc_deps_modules, rpath_filter_dirs=self.rpath_filter_dirs,
2930-
rpath_include_dirs=self.rpath_include_dirs, rpath_wrappers_dir=self.rpath_wrappers_dir)
2927+
self.toolchain.prepare(onlymod=self.cfg['onlytcmod'], deps=self.cfg.dependencies(),
2928+
silent=self.silent, loadmod=load_tc_deps_modules,
2929+
rpath_filter_dirs=self.rpath_filter_dirs,
2930+
rpath_include_dirs=self.rpath_include_dirs,
2931+
rpath_wrappers_dir=self.rpath_wrappers_dir)
29312932

29322933
# keep track of environment variables that were tweaked and need to be restored after environment got reset
29332934
# $TMPDIR may be tweaked for OpenMPI 2.x, which doesn't like long $TMPDIR paths...

easybuild/tools/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
277277
'regtest_output_dir',
278278
'rpath_filter',
279279
'rpath_override_dirs',
280-
'rpath_wrappers_dir',
281280
'required_linked_shared_libs',
282281
'search_path_cpp_headers',
283282
'search_path_linker',

easybuild/tools/options.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,6 @@ def override_options(self):
524524
'rpath-filter': ("List of regex patterns to use for filtering out RPATH paths", 'strlist', 'store', None),
525525
'rpath-override-dirs': ("Path(s) to be prepended when linking with RPATH (string, colon-separated)",
526526
None, 'store', None),
527-
'rpath-wrappers-dir': ("Absolute path to directory to use for RPATH wrappers creation/use",
528-
None, 'store', None),
529527
'sanity-check-only': ("Only run sanity check (module is expected to be installed already",
530528
None, 'store_true', False),
531529
'set-default-module': ("Set the generated module as default", None, 'store_true', False),

0 commit comments

Comments
 (0)