Skip to content

Add .xll as a recognized C++ shared-library extension #567

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
spektrof wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −6
Open

Add .xll as a recognized C++ shared-library extension #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions cc/common/cc_helper.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def _is_valid_shared_library_name(shared_library_name):
shared_library_name.endswith(".dll") or
shared_library_name.endswith(".dylib") or
shared_library_name.endswith(".pyd") or
shared_library_name.endswith(".wasm")):
shared_library_name.endswith(".wasm") or
shared_library_name.endswith(".xll")):
return True

return is_versioned_shared_library_extension_valid(shared_library_name)
Expand Down Expand Up @@ -510,7 +511,7 @@ def _get_toolchain_global_make_variables(cc_toolchain):
result["CROSSTOOLTOP"] = cc_toolchain._crosstool_top_path
return result

_SHARED_LIBRARY_EXTENSIONS = ["so", "dll", "dylib", "pyd", "wasm"]
_SHARED_LIBRARY_EXTENSIONS = ["so", "dll", "dylib", "pyd", "wasm", "xll"]

def _is_valid_shared_library_artifact(shared_library):
if (shared_library.extension in _SHARED_LIBRARY_EXTENSIONS):
Expand Down
6 changes: 3 additions & 3 deletions cc/common/cc_helper_internal.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ _ARCHIVE = [".a", ".lib"]
_PIC_ARCHIVE = [".pic.a"]
_ALWAYSLINK_LIBRARY = [".lo"]
_ALWAYSLINK_PIC_LIBRARY = [".pic.lo"]
_SHARED_LIBRARY = [".so", ".dylib", ".dll", ".pyd", ".wasm"]
_SHARED_LIBRARY = [".so", ".dylib", ".dll", ".pyd", ".wasm", ".xll"]
_INTERFACE_SHARED_LIBRARY = [".ifso", ".tbd", ".lib", ".dll.a"]
_OBJECT_FILE = [".o", ".obj"]
_PIC_OBJECT_FILE = [".pic.o"]
Expand Down Expand Up @@ -178,7 +178,7 @@ _ArtifactCategoryInfo, _unused_new_aci = provider(
_artifact_categories = [
_ArtifactCategoryInfo("STATIC_LIBRARY", "lib", ".a", ".lib"),
_ArtifactCategoryInfo("ALWAYSLINK_STATIC_LIBRARY", "lib", ".lo", ".lo.lib"),
_ArtifactCategoryInfo("DYNAMIC_LIBRARY", "lib", ".so", ".dylib", ".dll", ".pyd", ".wasm"),
_ArtifactCategoryInfo("DYNAMIC_LIBRARY", "lib", ".so", ".dylib", ".dll", ".pyd", ".wasm", ".xll"),
_ArtifactCategoryInfo("EXECUTABLE", "", "", ".exe", ".wasm"),
_ArtifactCategoryInfo("INTERFACE_LIBRARY", "lib", ".ifso", ".tbd", ".if.lib", ".lib"),
_ArtifactCategoryInfo("PIC_FILE", "", ".pic"),
Expand Down Expand Up @@ -320,7 +320,7 @@ def should_stamp(ctx):
)

def is_shared_library(file):
return file.extension in ["so", "dylib", "dll", "pyd", "wasm", "tgt", "vpi"]
return file.extension in ["so", "dylib", "dll", "pyd", "wasm", "tgt", "vpi", "xll"]

def is_versioned_shared_library(file):
# Because regex matching can be slow, we first do a quick check for ".so." and ".dylib."
Expand Down
2 changes: 1 addition & 1 deletion cc/private/rules_impl/cc_import.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def _perform_error_checks(

if (shared_library_artifact != None and
not cc_helper.is_valid_shared_library_artifact(shared_library_artifact)):
fail("'shared_library' does not produce any cc_import shared_library files (expected .so, .dylib, .dll or .pyd)")
fail("'shared_library' does not produce any cc_import shared_library files (expected .so, .dylib, .dll, .pyd or .xll)")

def _create_archive_action(
ctx,
Expand Down