From b6d1f45da2309f50bb12aef5ff63ab6955dbe1b9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 10 Feb 2022 18:39:17 +0100 Subject: Revert inclusion of our own openssl. --- src/lib/cross_linux.cc | 8 ++------ src/lib/cross_osx.cc | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/lib') diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index ee49d50bc..03829eb04 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -182,12 +182,8 @@ directory_containing_executable () boost::filesystem::path openssl_path () { - auto p = directory_containing_executable() / "dcpomatic2_openssl"; - if (boost::filesystem::is_regular_file(p)) { - return p; - } - - return "dcpomatic2_openssl"; + /* Assume it's on the path */ + return "openssl"; } diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index 2dc9b2702..50e4beb1c 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -151,7 +151,8 @@ mount_info () boost::filesystem::path openssl_path () { - return directory_containing_executable() / "openssl"; + /* Assume it's on the path */ + return "openssl"; } -- cgit v1.2.3