src: add HAVE_OPENSSL directive to openssl_config

danbev · danbev · commit fe17e9bc1578 · 2017-04-11T07:43:01.000+02:00
Currently when building with the following configuration options: $ ./configure --without-ssl && make The following link error is reported: Undefined symbols for architecture x86_64: "node::openssl_config", referenced from: node::Init(int*, char const**, int*, char const***) in node.o ld: symbol(s) not found for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) Adding an HAVE_OPENSSL directive around this code allows the build to pass. PR-URL: nodejs#11618 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
diff --git a/src/node.cc b/src/node.cc
@@ -4220,8 +4220,10 @@ void Init(int* argc,
         SafeGetenv("NODE_PRESERVE_SYMLINKS", &text) && text[0] == '1';
   }
 
+#if HAVE_OPENSSL
   if (openssl_config.empty())
     SafeGetenv("OPENSSL_CONF", &openssl_config);
+#endif
 
   // Parse a few arguments which are specific to Node.
   int v8_argc;

Original file line number	Diff line number	Diff line change
`@@ -4220,8 +4220,10 @@ void Init(int* argc,`
`4220`	`4220`	`SafeGetenv("NODE_PRESERVE_SYMLINKS", &text) && text[0] == '1';`
`4221`	`4221`	`}`
`4222`	`4222`
	`4223`	`+#if HAVE_OPENSSL`
`4223`	`4224`	`if (openssl_config.empty())`
`4224`	`4225`	`SafeGetenv("OPENSSL_CONF", &openssl_config);`
	`4226`	`+#endif`
`4225`	`4227`
`4226`	`4228`	`// Parse a few arguments which are specific to Node.`
`4227`	`4229`	`int v8_argc;`