Skip to content

clean up GCC-related options for full-LLVM build #3827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crivella merged 2 commits into from
Jul 9, 2025
+9 −12
Merged

clean up GCC-related options for full-LLVM build #3827

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
349007e
Cleanup GCC-related options for full-LLVM build
Flamefire Jul 4, 2025
747ad1d
Merge branch 'develop' into llvm-cleanup
Flamefire Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions easybuild/easyblocks/l/llvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,10 @@
'amdgpu'
]

# Used for full_llvm=True to remove any dependency on GCC/GCCcore
GCC_DEPENDENCY_OPTS_DEFAULT = {
'CLANG_DEFAULT_CXX_STDLIB': 'libc++',
'CLANG_DEFAULT_RTLIB': 'compiler-rt',
# Moved to general_opts for ease of building with openmp offload (or other multi-stage builds)
# 'CLANG_DEFAULT_LINKER': 'lld',
'CLANG_DEFAULT_UNWINDLIB': 'libunwind',

'COMPILER_RT_BUILD_GWP_ASAN': 'OFF',
Expand All @@ -97,8 +96,8 @@

'LIBCXX_CXX_ABI': 'libcxxabi',
'LIBCXX_DEFAULT_ABI_LIBRARY': 'libcxxabi',
# Needed as libatomic could not be present on the system (compilation and tests will succeed because of the
# GCCcore builddep, but usage/sanity check will fail due to missing libatomic)
# Needed as libatomic could not be present on the system (compilation and tests will succeed because of
# a possible GCCcore builddep, but usage/sanity check will fail due to missing libatomic)
'LIBCXX_HAS_ATOMIC_LIB': 'OFF',
'LIBCXX_HAS_GCC_S_LIB': 'OFF',
'LIBCXX_USE_COMPILER_RT': 'ON',
Expand All @@ -110,10 +109,6 @@
'LIBUNWIND_HAS_GCC_S_LIB': 'OFF',
'LIBUNWIND_USE_COMPILER_RT': 'ON',

# Libxml2 from system gets automatically detected and linked in bringing dependencies from stdc++, gcc_s, icuuc, etc
# Moved to a check at the configure step. See https://github.com/easybuilders/easybuild-easyconfigs/issues/22491
# 'LLVM_ENABLE_LIBXML2': 'OFF',

'SANITIZER_USE_STATIC_LLVM_UNWINDER': 'ON',
}

Expand Down Expand Up @@ -365,13 +360,15 @@ def __init__(self, *args, **kwargs):
self.general_opts['CLANG_DEFAULT_LINKER'] = 'lld'
self.general_opts['FLANG_DEFAULT_LINKER'] = 'lld'

# Used for full_llvm=True to remove any dependency on GCC/GCCcore
self.remove_gcc_dependency_opts = GCC_DEPENDENCY_OPTS_DEFAULT.copy()
if self.cfg['build_lldb']:
self.final_projects.append('lldb')
if self.full_llvm:
self.remove_gcc_dependency_opts['LLDB_ENABLE_LIBXML2'] = 'OFF'
self.remove_gcc_dependency_opts['LLDB_ENABLE_LZMA'] = 'OFF'
self.remove_gcc_dependency_opts['LLDB_ENABLE_PYTHON'] = 'OFF'
self.remove_gcc_dependency_opts.update({
'LLDB_ENABLE_LIBXML2': 'OFF',
'LLDB_ENABLE_LZMA': 'OFF',
'LLDB_ENABLE_PYTHON': 'OFF',
})

if self.cfg['build_bolt']:
self.final_projects.append('bolt')
Expand Down