Skip to content

Pass -file-compilation-dir . explicitly to the Swift driver so that .swiftmodule files are hermetic. #1554

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
merged 3 commits into from
Aug 1, 2025
Merged

Pass -file-compilation-dir . explicitly to the Swift driver so that .swiftmodule files are hermetic. #1554

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27cfec7
Pass `-file-compilation-dir .` explicitly to the Swift driver so that…
allevato Jul 29, 2025
1522eb3
Add all_compile_action_names convenience function
adincebic Jul 30, 2025
badf065
Merge branch 'master' into adin/pick-9c4fbaedfaca0932cdca51f7d8b6e882…
aaronsky Aug 1, 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
7 changes: 7 additions & 0 deletions swift/internal/action_names.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,10 @@ def all_action_names():
SWIFT_ACTION_SYMBOL_GRAPH_EXTRACT,
SWIFT_ACTION_SYNTHESIZE_INTERFACE,
)

def all_compile_action_names():
"""Returns all actions that compile source files."""
return [
SWIFT_ACTION_COMPILE,
SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
]
16 changes: 16 additions & 0 deletions swift/toolchains/config/compile_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ load(
"SWIFT_ACTION_PRECOMPILE_C_MODULE",
"SWIFT_ACTION_SYMBOL_GRAPH_EXTRACT",
"SWIFT_ACTION_SYNTHESIZE_INTERFACE",
"all_compile_action_names",
)
load(
"//swift/internal:developer_dirs.bzl",
Expand Down Expand Up @@ -642,6 +643,21 @@ def compile_action_configs(
#### Flags controlling how Swift/Clang modular inputs are processed

action_configs += [

# When `-g` is passed to the compiler, the driver will pass
# `-file-compilation-dir <CWD>` to the frontend, which in turn passes
# `-ffile-compilation-dir <CWD>` to Clang. This CWD is fully resolved so
# it contains the absolute path to the workspace. If we pass
# `-file-compilation-dir .`, then the driver/frontend preserve that
# spelling, ensuring that the ClangImporter options section of the
# `.swiftmodule` file is hermetic.
ActionConfigInfo(
actions = all_compile_action_names(),
configurators = [
add_arg("-file-compilation-dir", "."),
],
),

# Treat paths in .modulemap files as workspace-relative, not modulemap-
# relative.
ActionConfigInfo(
Expand Down