diff options
| -rw-r--r-- | external/db_drivers/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/crypto/slow-hash.c | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/external/db_drivers/CMakeLists.txt b/external/db_drivers/CMakeLists.txt index 99b3a20bf..cd7479724 100644 --- a/external/db_drivers/CMakeLists.txt +++ b/external/db_drivers/CMakeLists.txt @@ -37,13 +37,8 @@ set(LMDB_LIBRARY "lmdb" CACHE STRING "LMDB Library name") if (NOT STATIC) find_package(BerkeleyDB) - if(NOT BERKELEY_DB_LIBRARIES OR STATIC) - add_subdirectory(libdb) - message(STATUS "BerkeleyDB not found, building from src tree") - - set(BDB_STATIC true CACHE BOOL "BDB Static flag") - set(BDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libdb" CACHE STRING "BDB include path") - set(BDB_LIBRARY "db" CACHE STRING "BDB library name") + if(NOT BERKELEY_DB_LIBRARIES) + die("BerkeleyDB not found. At this time it should be installed in your system for a non-static build.") else() message(STATUS "Found BerkeleyDB include (db.h) in ${BERKELEY_DB_INCLUDE_DIR}") if(BERKELEY_DB_LIBRARIES) diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c index 131c216a8..425737984 100644 --- a/src/crypto/slow-hash.c +++ b/src/crypto/slow-hash.c @@ -37,7 +37,7 @@ #include "hash-ops.h" #include "oaes_lib.h" -#if defined(__x86_64__) || defined(__i386) +#if defined(__x86_64__) // Optimised code below, uses x86-specific intrinsics, SSE2, AES-NI // Fall back to more portable code is down at the bottom |