From d3bcb97e5a1c8caeba0b05102c03f60091fb5c69 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Sat, 23 Nov 2024 12:06:02 +0100 Subject: [PATCH] build: use variable for crypto dep path PR-URL: https://github.com/nodejs/node/pull/55928 Reviewed-By: Cheng Zhao Reviewed-By: Luigi Pinca --- deps/ncrypto/unofficial.gni | 2 +- node.gni | 2 ++ unofficial.gni | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deps/ncrypto/unofficial.gni b/deps/ncrypto/unofficial.gni index ea024af73e2..7cb27d22b9b 100644 --- a/deps/ncrypto/unofficial.gni +++ b/deps/ncrypto/unofficial.gni @@ -27,6 +27,6 @@ template("ncrypto_gn_build") { forward_variables_from(invoker, "*") public_configs = [ ":ncrypto_config" ] sources = gypi_values.ncrypto_sources - deps = [ "../openssl" ] + deps = [ "$node_openssl_path" ] } } diff --git a/node.gni b/node.gni index 057686f0046..e199bba2d38 100644 --- a/node.gni +++ b/node.gni @@ -10,6 +10,8 @@ declare_args() { # The location of V8, use the one from node's deps by default. node_v8_path = "$node_path/deps/v8" + node_openssl_path = "$node_path/deps/openssl" + # 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 1caadb88346..e2d370329c0 100644 --- a/unofficial.gni +++ b/unofficial.gni @@ -185,7 +185,7 @@ template("node_gn_build") { } if (node_use_openssl) { deps += [ "deps/ncrypto" ] - public_deps += [ "deps/openssl" ] + public_deps += [ "$node_openssl_path" ] sources += gypi_values.node_crypto_sources } if (node_enable_inspector) {