Skip to content

Commit bdc1c10

Browse files
committed
Fix protobuf_javascript to be able to find our node binary
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 4582736 commit bdc1c10

1 file changed

Lines changed: 16 additions & 3 deletions

File tree

bazel/external/protobuf_javascript.patch

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1+
diff --git a/generator/BUILD.bazel b/generator/BUILD.bazel
2+
index ac7756d..a3480c8 100644
3+
--- a/generator/BUILD.bazel
4+
+++ b/generator/BUILD.bazel
5+
@@ -2,7 +2,7 @@ genrule(
6+
name = "generate_version_header",
7+
srcs = ["//:package.json"],
8+
outs = ["version.h"],
9+
- cmd = "node $(location //:generate-version-header.js) $(OUTS)",
10+
+ cmd = "/opt/px_dev/tools/node/bin/node $(location //:generate-version-header.js) $(OUTS)",
11+
tools = ["//:generate-version-header.js"],
12+
)
13+
114
diff --git a/generator/js_generator.cc b/generator/js_generator.cc
2-
index 97b5844..1351a54 100644
15+
index 7ba8bf0..09b1391 100644
316
--- a/generator/js_generator.cc
417
+++ b/generator/js_generator.cc
5-
@@ -3648,6 +3648,9 @@ void Generator::GenerateFile(const GeneratorOptions& options,
6-
18+
@@ -3647,6 +3647,9 @@ void Generator::GenerateFile(const GeneratorOptions& options,
19+
720
for (int i = 0; i < file->dependency_count(); i++) {
821
const std::string name = std::string(file->dependency(i)->name());
922
+ if (ModuleAlias(name) == "gogoproto_gogo_pb") {

0 commit comments

Comments
 (0)