From a1d980c4e0582b8a09587970cde4b1c9ff42b6f6 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 11 Dec 2024 16:35:48 +0100 Subject: [PATCH] build: use variable for simdutf path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/56196 Reviewed-By: Juan José Arboleda Reviewed-By: Cheng Zhao Reviewed-By: Luigi Pinca Reviewed-By: James M Snell --- node.gni | 6 +++++- unofficial.gni | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/node.gni b/node.gni index e199bba2d38641..a2123cc6c6d21c 100644 --- a/node.gni +++ b/node.gni @@ -7,11 +7,15 @@ declare_args() { # The location of Node.js in source code tree. node_path = "//node" - # The location of V8, use the one from node's deps by default. + # The location of V8 - use the one from node's deps by default. node_v8_path = "$node_path/deps/v8" + # The location of OpenSSL - use the one from node's deps by default. node_openssl_path = "$node_path/deps/openssl" + # The location of simdutf - use the one from node's deps by default. + node_simdutf_path = "$node_path/deps/simdutf" + # The NODE_MODULE_VERSION defined in node_version.h. node_module_version = exec_script("$node_path/tools/getmoduleversion.py", [], "value") diff --git a/unofficial.gni b/unofficial.gni index 7f34a0491b901b..193a0d8ff2df5e 100644 --- a/unofficial.gni +++ b/unofficial.gni @@ -158,10 +158,10 @@ template("node_gn_build") { "deps/nghttp2", "deps/ngtcp2", "deps/postject", - "deps/simdutf", "deps/sqlite", "deps/uvwasi", "//third_party/zlib", + "$node_simdutf_path", "$node_v8_path:v8_libplatform", ] @@ -300,8 +300,8 @@ template("node_gn_build") { executable("node_js2c") { deps = [ - "deps/simdutf", "deps/uv", + "$node_simdutf_path", ] sources = [ "tools/js2c.cc", @@ -358,7 +358,7 @@ template("node_gn_build") { "deps/googletest", "deps/googletest:gtest_main", "deps/nbytes", - "deps/simdutf", + "$node_simdutf_path", ] sources = gypi_values.node_cctest_sources