Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions bazel/emscripten_toolchain/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
load("@rules_python//python:py_binary.bzl", "py_binary")
load("//:emscripten_deps.bzl", "emscripten_repo_name")
load("//:remote_emscripten_repository.bzl", "create_toolchains", "emscripten_toolchain_name")
load(":platform_info.bzl", "platform_info")

package(default_visibility = ["//visibility:public"])

# dlmalloc.bc is implicitly added by the emscripten toolchain
cc_library(name = "malloc")

platform_info(
name = "platform_info",
script_extension = select({
"@platforms//os:windows": ".bat",
"//conditions:default": ".sh",
}),
visibility = [":__subpackages__"],
)

create_toolchains(
name = emscripten_toolchain_name("linux"),
exec_compatible_with = [
Expand Down
22 changes: 22 additions & 0 deletions bazel/emscripten_toolchain/platform_info.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
"""Defines a provider and rule for platform information.
"""

PlatformInfo = provider(
doc = "Provides some info about a platform",
fields = {
"script_extension": "The script extension for the platform, e.g. '.sh' or '.bat'",
},
)

platform_info = rule(
implementation = lambda ctx: PlatformInfo(
script_extension = ctx.attr.script_extension,
),
attrs = {
"script_extension": attr.string(
mandatory = True,
values = [".sh", ".bat"],
doc = "The script extension for the platform, e.g. '.sh' or '.bat'",
),
},
)
16 changes: 11 additions & 5 deletions bazel/emscripten_toolchain/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ load(
_flag_set = "flag_set",
)
load("@rules_cc//cc:defs.bzl", "CcToolchainConfigInfo", "cc_common")
load(":platform_info.bzl", "PlatformInfo", "platform_info")

def flag_set(flags = None, features = None, not_features = None, **kwargs):
"""Extension to flag_set which allows for a "simple" form.
Expand Down Expand Up @@ -56,6 +57,8 @@ CROSSTOOL_DEFAULT_WARNINGS = [
]

def _impl(ctx):
platform_info = ctx.attr._exec_platform_info[PlatformInfo]

target_cpu = ctx.attr.cpu
toolchain_identifier = "emscripten-" + target_cpu
target_system_name = target_cpu + "-unknown-emscripten"
Expand All @@ -82,9 +85,9 @@ def _impl(ctx):

builtin_sysroot = emscripten_dir + "/emscripten/cache/sysroot"

emcc_script = "emcc.%s" % ctx.attr.script_extension
emcc_link_script = "emcc_link.%s" % ctx.attr.script_extension
emar_script = "emar.%s" % ctx.attr.script_extension
emcc_script = "emcc" + platform_info.script_extension
emcc_link_script = "emcc_link" + platform_info.script_extension
emar_script = "emar" + platform_info.script_extension

################################################################
# Tools
Expand Down Expand Up @@ -1162,7 +1165,11 @@ emscripten_cc_toolchain_config_rule = rule(
"em_config": attr.label(mandatory = True, allow_single_file = True),
"emscripten_binaries": attr.label(mandatory = True, cfg = "exec"),
"nodejs_bin": attr.label(mandatory = True, allow_single_file = True),
"script_extension": attr.string(mandatory = True, values = ["sh", "bat"]),
"_exec_platform_info": attr.label(
providers = [PlatformInfo],
default = Label(":platform_info"),
cfg = "exec",
),
},
provides = [CcToolchainConfigInfo],
toolchains = [
Expand All @@ -1178,7 +1185,6 @@ def _python_interpreter_files_impl(ctx):

return DefaultInfo(files = python_exec_runtime.files)


emscripten_python_interpreter_files = rule(
implementation = _python_interpreter_files_impl,
toolchains = [
Expand Down
4 changes: 0 additions & 4 deletions bazel/remote_emscripten_repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@ def create_toolchains(name, repo_name, exec_compatible_with):
em_config = "@emscripten_cache//:emscripten_config",
emscripten_binaries = repo_compiler_files_target,
nodejs_bin = "@nodejs//:node",
script_extension = select({
"@bazel_tools//src/conditions:host_windows": "bat",
"//conditions:default": "sh",
}),
)

cc_toolchain(
Expand Down