Skip to content

Commit e23aac7

Browse files
authored
Fix #1020 (#1035)
1 parent 9483a23 commit e23aac7

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

bazel/emscripten_toolchain/BUILD.bazel

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ load(":crosstool.bzl", "emscripten_cc_toolchain_config_rule")
22

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

5+
# Name depends on rules_nodejs version being used.
6+
# https://github.com/emscripten-core/emsdk/issues/1020
7+
# https://github.com/bazelbuild/rules_nodejs/issues/3375
8+
node_files = "@nodejs_host//:node_files" if existing_rule("@nodejs_host//:node_files") else "@nodejs//:node_files"
9+
510
filegroup(
611
name = "common-script-includes",
712
srcs = [
@@ -14,7 +19,7 @@ filegroup(
1419
"env.bat",
1520
"@emsdk//:binaries",
1621
"@emsdk//:node_modules",
17-
"@nodejs//:node_files",
22+
node_files,
1823
],
1924
)
2025

@@ -31,7 +36,7 @@ filegroup(
3136
"link_wrapper.py",
3237
":common-script-includes",
3338
"@emsdk//:binaries",
34-
"@nodejs//:node_files",
39+
node_files,
3540
],
3641
)
3742

@@ -41,7 +46,7 @@ filegroup(
4146
":compile-emscripten",
4247
":link-emscripten",
4348
"@emsdk//:binaries",
44-
"@nodejs//:node_files",
49+
node_files,
4550
],
4651
)
4752

0 commit comments

Comments
 (0)