Skip to content
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

Jump to bottom

Support Clang on Windows in prelude #804

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support Clang on Windows in prelude #804

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
6d510d9
works for my engine
ashwinbanwari Nov 10, 2024
26dca94
update clang_tools default archiver name
ashwinbanwari Nov 11, 2024
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
6 changes: 5 additions & 1 deletion prelude/cxx/cxx_executable.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,11 @@ def cxx_executable(ctx: AnalysisContext, impl_params: CxxRuleConstructorParams,
inherited_preprocessor_infos,
is_coverage_enabled_by_any_dep(ctx, preprocessor_deps),
)
compile_flavor = CxxCompileFlavor("pic") if link_strategy != LinkStrategy("static") else CxxCompileFlavor("default")
if link_strategy == LinkStrategy("static") or get_cxx_toolchain_info(ctx).pic_behavior != "supported":
compile_flavor = CxxCompileFlavor("default")
else:
compile_flavor = CxxCompileFlavor("pic")

cxx_outs = compile_cxx(
ctx = ctx,
src_compile_cmds = compile_cmd_output.src_compile_cmds,
Expand Down
3 changes: 1 addition & 2 deletions prelude/cxx/cxx_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,8 +1379,7 @@ def _strip_objects(ctx: AnalysisContext, objects: list[Artifact]) -> list[Artifa
cxx_toolchain_info = get_cxx_toolchain_info(ctx)

# Stripping is not supported on Windows
linker_type = cxx_toolchain_info.linker_info.type
if linker_type == LinkerType("windows"):
if host_info().os.is_windows:
return objects

# Disable stripping if no `strip` binary was provided by the toolchain.
Expand Down
2 changes: 1 addition & 1 deletion prelude/cxx/cxx_link_utility.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def executable_shared_lib_arguments(
linker_type = cxx_toolchain.linker_info.type

if len(shared_libs) > 0:
if linker_type == LinkerType("windows"):
if host_info().os.is_windows:
shared_libs_symlink_tree = [ctx.actions.symlink_file(
shlib.lib.output.basename,
shlib.lib.output,
Expand Down
7 changes: 2 additions & 5 deletions prelude/toolchains/cxx.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def _cxx_toolchain_from_cxx_tools_info(ctx: AnalysisContext, cxx_tools_info: Cxx
additional_linker_flags = ["-fuse-ld=lld"] if os == "linux" and cxx_tools_info.linker != "g++" and cxx_tools_info.cxx_compiler != "g++" else []

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

if 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 All @@ -137,7 +134,7 @@ def _cxx_toolchain_from_cxx_tools_info(ctx: AnalysisContext, cxx_tools_info: Cxx
archiver_supports_argfiles = archiver_supports_argfiles,
generate_linker_maps = False,
lto_mode = LtoMode("none"),
type = linker_type,
type = cxx_tools_info.linker_type,
link_binaries_locally = True,
link_libraries_locally = True,
archive_objects_locally = True,
Expand All @@ -156,7 +153,7 @@ def _cxx_toolchain_from_cxx_tools_info(ctx: AnalysisContext, cxx_tools_info: Cxx
shared_library_versioned_name_format = shared_library_versioned_name_format,
static_library_extension = static_library_extension,
force_full_hybrid_if_capable = False,
is_pdb_generated = is_pdb_generated(linker_type, ctx.attrs.link_flags),
is_pdb_generated = is_pdb_generated(cxx_tools_info.linker_type, ctx.attrs.link_flags),
link_ordering = ctx.attrs.link_ordering,
),
bolt_enabled = False,
Expand Down
6 changes: 5 additions & 1 deletion prelude/toolchains/cxx/clang/tools.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ load("@prelude//cxx:cxx_toolchain_types.bzl", "LinkerType")
load("@prelude//toolchains:cxx.bzl", "CxxToolsInfo")

def _path_clang_tools_impl(_ctx) -> list[Provider]:
if host_info().os.is_windows:
archiver = "llvm-ar"
else:
archiver = "ar"
return [
DefaultInfo(),
CxxToolsInfo(
Expand All @@ -19,7 +23,7 @@ def _path_clang_tools_impl(_ctx) -> list[Provider]:
asm_compiler_type = "clang",
rc_compiler = None,
cvtres_compiler = None,
archiver = "ar",
archiver = archiver,
archiver_type = "gnu",
linker = "clang++",
linker_type = LinkerType("gnu"),
Expand Down