Pick -lcrypto up from the spot defined by dep_libcrypto

Also avoid a bunch of warning: as compile commands don't take -L:
c++: warning: argument unused during compilation: '-L/usr/local/eboringssl/lib' [-Wunused-command-line -argument]

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/meson/libcrypto/meson.build b/meson/libcrypto/meson.build
index 9af7840f166496d43fd2c1de1305bf36d9b4df83..e3d62ce26cfdfe8e3a81591ed04a087322b2e102 100644 (file)
--- a/meson/libcrypto/meson.build
+++ b/meson/libcrypto/meson.build
@@ -44,8 +44,7 @@ if not dep_libcrypto.found()
     have = cxx.has_header(dir / 'include/openssl/crypto.h')
     if have
       dep_libcrypto = declare_dependency(
-        compile_args: ['-L' + dir / 'lib'],
-        link_args: ['-lcrypto'],
+        link_args: ['-L' + dir / 'lib', '-lcrypto'],
         include_directories: include_directories(dir / 'include', is_system: false),
       )
       break

diff --git a/meson/libssl/meson.build b/meson/libssl/meson.build
index a175d07cd60ec2ec20ae0665d3da7189e5054368..7651a3025a6dfc2e927d8d1266ab4afae22e4a55 100644 (file)
--- a/meson/libssl/meson.build
+++ b/meson/libssl/meson.build
@@ -5,7 +5,7 @@ opt_libssl_dir = get_option('tls-libssl-dir')
 if opt_libssl_dir != ''
   dep_libssl = declare_dependency(
     include_directories: [opt_libssl_dir / 'include'],
-    link_args: ['-L' + opt_libssl_dir / 'lib', '-lssl', '-lcrypto'],
+    link_args: ['-L' + opt_libssl_dir / 'lib', '-lssl'],
   )
 else
   dep_libssl = dependency('libssl', required: opt_libssl)