summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-02-10 18:39:17 +0100
committerCarl Hetherington <cth@carlh.net>2022-02-10 18:39:17 +0100
commitb6d1f45da2309f50bb12aef5ff63ab6955dbe1b9 (patch)
treec1d82a53b85dafec6593a4e8606934daa7b91f03 /src
parent47eb4bb86b59bd2e28dceac857397ae8df8ed1de (diff)
Revert inclusion of our own openssl.2174-no-shipped-openssl
Diffstat (limited to 'src')
-rw-r--r--src/lib/cross_linux.cc8
-rw-r--r--src/lib/cross_osx.cc3
2 files changed, 4 insertions, 7 deletions
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";
}