diff --git a/CMakeLists.txt b/CMakeLists.txt index 37cee70d784d1d26b4119fbb4b6cd9cdb3a98cf7..7a6c7d1fd17658587dbe687be27ced4a87a28d82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,18 +66,6 @@ if ("${OPENSSL_ROOT_DIR}" STREQUAL "") endif() endif() -if ("${OPENSSL_LIBRARIES}" STREQUAL "") - if (NOT "$ENV{OPENSSL_LIBRARIES}" STREQUAL "") - set(OPENSSL_LIBRARIES $ENV{OPENSSL_LIBRARIES}) - elseif (APPLE) - set(OPENSSL_LIBRARIES "/usr/local/opt/openssl/lib") - elseif(UNIX AND NOT APPLE) - set(OPENSSL_LIBRARIES "/usr/include/openssl") - else() - message(FATAL_ERROR "openssl libs not found and don't know where to look, please specify OPENSSL_LIBRARIES") - endif() -endif() - if(UNIX) if(APPLE) set(whole_archive_flag "-force_load") diff --git a/eosio_build.sh b/eosio_build.sh index ddd1baabdaff056b77c45918be8cdbeec7a7bf2d..379bd445ff089154492a39c598e634d3aef99c2e 100755 --- a/eosio_build.sh +++ b/eosio_build.sh @@ -112,7 +112,6 @@ export BOOST_ROOT=${HOME}/opt/boost_1_66_0 export OPENSSL_ROOT_DIR=/usr/include/openssl - export OPENSSL_LIBRARIES=/usr/include/openssl export WASM_ROOT=${HOME}/opt/wasm fi @@ -122,7 +121,6 @@ C_COMPILER=clang MONGOD_CONF=/usr/local/etc/mongod.conf OPENSSL_ROOT_DIR=/usr/local/opt/openssl - OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib export WASM_ROOT=/usr/local/wasm fi @@ -145,7 +143,7 @@ $CMAKE -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} \ -DCMAKE_C_COMPILER=${C_COMPILER} -DWASM_ROOT=${WASM_ROOT} \ -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DBUILD_MONGO_DB_PLUGIN=true \ - -DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES} .. + .. if [ $? -ne 0 ]; then printf "\n\t>>>>>>>>>>>>>>>>>>>> CMAKE building EOSIO has exited with the above error.\n\n" @@ -201,7 +199,7 @@ # Build eos.io package $CMAKE -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} \ -DCMAKE_C_COMPILER=${C_COMPILER} -DWASM_ROOT=${WASM_ROOT} \ - -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES} \ + -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} \ -DCMAKE_INSTALL_PREFIX=/usr .. if [ $? -ne 0 ]; then