Skip to content

Propagate linker_type correctly in the system_cxx_toolchain #1295

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

Open
Nehliin wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −6
Open

Propagate linker_type correctly in the system_cxx_toolchain #1295

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
db68b3b
Propagate linker type from tools info
Nehliin Apr 15, 2026
de83962
Support darwin still
Nehliin Apr 15, 2026
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
4 changes: 1 addition & 3 deletions prelude/toolchains/cxx.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ def _cxx_toolchain_from_cxx_tools_info(ctx: AnalysisContext, cxx_tools_info: Cxx
archiver_supports_argfiles = os != Os("macos")
additional_linker_flags = ["-fuse-ld=lld"] if os == Os("linux") and cxx_tools_info.linker != "g++" and cxx_tools_info.cxx_compiler != "g++" else []

linker_type = cxx_tools_info.linker_type
if os == Os("windows"):
linker_type = LinkerType("windows")
binary_extension = "exe"
object_file_extension = "obj"
static_library_extension = "lib"
Expand All @@ -116,10 +116,8 @@ def _cxx_toolchain_from_cxx_tools_info(ctx: AnalysisContext, cxx_tools_info: Cxx
shared_library_versioned_name_format = "{}.so.{}"

if os == Os("macos"):
linker_type = LinkerType("darwin")
pic_behavior = PicBehavior("always_enabled")
else:
linker_type = LinkerType("gnu")
pic_behavior = PicBehavior("supported")

if cxx_tools_info.compiler_type == "clang":
Expand Down
11 changes: 8 additions & 3 deletions prelude/toolchains/cxx/clang/tools.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
load("@prelude//cxx:cxx_toolchain_types.bzl", "LinkerType")
load("@prelude//toolchains:cxx.bzl", "CxxToolsInfo")

def _path_clang_tools_impl(_ctx) -> list[Provider]:
def _path_clang_tools_impl(ctx) -> list[Provider]:
return [
DefaultInfo(),
CxxToolsInfo(
Expand All @@ -23,11 +23,16 @@ def _path_clang_tools_impl(_ctx) -> list[Provider]:
archiver = "ar",
archiver_type = "gnu",
linker = "clang++",
linker_type = LinkerType("gnu"),
linker_type = LinkerType(ctx.attrs.linker_type),
),
]

path_clang_tools = rule(
impl = _path_clang_tools_impl,
attrs = {},
attrs = {
"linker_type": attrs.string(default = select({
"DEFAULT": "gnu",
"config//os:macos": "darwin",
})),
},
)