Skip to content

[libc++] Remove the explicit Clang/LSV CI job #131667

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

Closed
wants to merge 2 commits into from
Closed

[libc++] Remove the explicit Clang/LSV CI job #131667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
664b5a6
[libc++] Remove the explicit Clang/LSV CI job
ldionne Mar 17, 2025
599bfbb
Fix broken paren
ldionne Mar 18, 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
1 change: 0 additions & 1 deletion .github/workflows/libcxx-build-and-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ jobs:
'generic-hardening-mode-fast',
'generic-hardening-mode-fast-with-abi-breaks',
'generic-merged',
'generic-modules-lsv',
'generic-no-exceptions',
'generic-no-experimental',
'generic-no-filesystem',
Expand Down
2 changes: 0 additions & 2 deletions libcxx/cmake/caches/Generic-modules-lsv.cmake
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions libcxx/utils/ci/run-buildbot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,12 +454,6 @@ generic-modules)
check-runtimes
check-abi-list
;;
generic-modules-lsv)
clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-modules-lsv.cmake"
check-runtimes
check-abi-list
;;
#
# Parts removed
#
Expand Down
15 changes: 7 additions & 8 deletions libcxx/utils/libcxx/test/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,24 +207,23 @@ def getSuitableClangTidy(cfg):
),
Parameter(
name="enable_modules",
choices=["none", "clang", "clang-lsv"],
choices=["none", "clang"],
type=str,
help="Whether to build the test suite with modules enabled. "
"Select `clang` for Clang modules, and 'clang-lsv' for Clang modules with Local Submodule Visibility.",
help="Whether to build the test suite with Clang modules enabled. Select `clang` for Clang modules, and "
"'none' for a non-modular build. Note that recent versions of Clang enable Local Submodule Visibility "
"by default in C++20 and later.",
default="none",
actions=lambda modules: filter(None, [
AddFeature("clang-modules-build") if modules in ("clang", "clang-lsv") else None,
AddFeature("clang-modules-build") if modules == "clang" else None,

# Note: AppleClang disregards -fmodules entirely when compiling C++, so we also pass -fcxx-modules
# to enable modules for C++.
AddCompileFlag("-fmodules -fcxx-modules") if modules in ("clang", "clang-lsv") else None,
AddCompileFlag("-fmodules -fcxx-modules") if modules == "clang" else None,

# Note: We use a custom modules cache path to make sure that we don't reuse
# the default one, which can be shared across CI builds with different
# configurations.
AddCompileFlag(lambda cfg: f"-fmodules-cache-path={cfg.test_exec_root}/ModuleCache") if modules in ("clang", "clang-lsv") else None,

AddCompileFlag("-Xclang -fmodules-local-submodule-visibility") if modules == "clang-lsv" else None,
AddCompileFlag(lambda cfg: f"-fmodules-cache-path={cfg.test_exec_root}/ModuleCache") if modules == "clang" else None,
])
),
Parameter(
Expand Down