Skip to content

Commit 90b1c7e

Browse files
committed
Merge #13659: build: add missing leveldb defines
768981c build: add missing leveldb defines (Cory Fields) Pull request description: Fixes #13585. src/leveldb/build_detect_platform shows how upstream defines them. These platform may not be able to fully build or run Bitcoin Core, but defining all known to leveldb saves future hassle. Now that all possible platforms are enumerated, specifying an unknown one is an error. Tree-SHA512: 89adfb8867248e50d713cb84485c72a398df8b2af467599cf292132342b5b47f01be3a298ca33e382e210004123aa72a6338bc911d38d40d8ceaef5083e0b025
2 parents d6b2235 + 768981c commit 90b1c7e

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

configure.ac

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,10 +541,17 @@ case $host in
541541
CPPFLAGS="$CPPFLAGS -DMAC_OSX"
542542
OBJCXXFLAGS="$CXXFLAGS"
543543
;;
544+
*android*)
545+
dnl make sure android stays above linux for hosts like *linux-android*
546+
LEVELDB_TARGET_FLAGS="-DOS_ANDROID"
547+
;;
544548
*linux*)
545549
TARGET_OS=linux
546550
LEVELDB_TARGET_FLAGS="-DOS_LINUX"
547551
;;
552+
*kfreebsd*)
553+
LEVELDB_TARGET_FLAGS="-DOS_KFREEBSD"
554+
;;
548555
*freebsd*)
549556
LEVELDB_TARGET_FLAGS="-DOS_FREEBSD"
550557
;;
@@ -554,10 +561,17 @@ case $host in
554561
*netbsd*)
555562
LEVELDB_TARGET_FLAGS="-DOS_NETBSD"
556563
;;
564+
*dragonfly*)
565+
LEVELDB_TARGET_FLAGS="-DOS_DRAGONFLYBSD"
566+
;;
567+
*solaris*)
568+
LEVELDB_TARGET_FLAGS="-DOS_SOLARIS"
569+
;;
570+
*hpux*)
571+
LEVELDB_TARGET_FLAGS="-DOS_HPUX"
572+
;;
557573
*)
558-
OTHER_OS=`echo ${host_os} | awk '{print toupper($0)}'`
559-
AC_MSG_WARN([Guessing LevelDB OS as OS_${OTHER_OS}, please check whether this is correct, if not add an entry to configure.ac.])
560-
LEVELDB_TARGET_FLAGS="-DOS_${OTHER_OS}"
574+
AC_MSG_ERROR(Cannot build leveldb for $host. Please file a bug report.)
561575
;;
562576
esac
563577

0 commit comments

Comments
 (0)