build: use variable for crypto dep path

codebytere · aduh95 · commit 26ec99634c5f · 2024-11-26T15:34:29.000+01:00
PR-URL: #55928 Reviewed-By: Cheng Zhao <zcbenz@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git 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
@@ -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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ template("ncrypto_gn_build") {`
`27`	`27`	`forward_variables_from(invoker, "*")`
`28`	`28`	`public_configs = [ ":ncrypto_config" ]`
`29`	`29`	`sources = gypi_values.ncrypto_sources`
`30`		`- deps = [ "../openssl" ]`
	`30`	`+ deps = [ "$node_openssl_path" ]`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ template("node_gn_build") {`
`185`	`185`	`}`
`186`	`186`	`if (node_use_openssl) {`
`187`	`187`	`deps += [ "deps/ncrypto" ]`
`188`		`- public_deps += [ "deps/openssl" ]`
	`188`	`+ public_deps += [ "$node_openssl_path" ]`
`189`	`189`	`sources += gypi_values.node_crypto_sources`
`190`	`190`	`}`
`191`	`191`	`if (node_enable_inspector) {`