Skip to content

Commit 11c5a04

Browse files
authored
Merge pull request #4010 from Crivella/fix-llvm_newergcctests
enhance LLVM easyblock to fix tests not finding GCCcore libraries
2 parents f8da68a + 28cd918 commit 11c5a04

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

easybuild/easyblocks/l/llvm.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,15 +1089,14 @@ def _create_compiler_config_file(self, installdir):
10891089
# prefix = self.sysroot.rstrip('/')
10901090
# opts.append(f'--dyld-prefix={prefix}')
10911091

1092-
# Check, for a non `full_llvm` build, if GCCcore is in the LIBRARY_PATH, and if not add it;
1092+
# For a non `full_llvm` build, always add GCCcore with a -L in the config file
1093+
# This is needed even if GCCcore is in the LIBRARY_PATH as some tests will filter it out;
10931094
# This is needed as the runtimes tests will not add the -L option to the linker command line for GCCcore
10941095
# otherwise
10951096
if not self.full_llvm:
10961097
gcc_lib = self._get_gcc_libpath(strict=True)
1097-
lib_path = os.getenv('LIBRARY_PATH', '')
1098-
if gcc_lib not in lib_path:
1099-
self.log.info("Adding GCCcore libraries location `%s` the config files", gcc_lib)
1100-
opts.append(f'-L{gcc_lib}')
1098+
self.log.info("Adding GCCcore libraries location `%s` the config files", gcc_lib)
1099+
opts.append(f'-L{gcc_lib}')
11011100

11021101
for comp in self.cfg_compilers:
11031102
write_file(os.path.join(bin_dir, f'{comp}.cfg'), ' '.join(opts))

0 commit comments

Comments
 (0)