diff options
| author | Pieter Wuille <[email protected]> | 2018-07-13 19:34:17 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2018-07-13 19:35:18 -0700 |
| commit | 90b1c7e5c50551f39d4983008d1d5ab3b085803e (patch) | |
| tree | 9babf8fe8188d1c8d0048b6564b96da17cb19241 | |
| parent | Merge #13630: Drop unused pindexRet arg to CMerkleTx::GetDepthInMainChain (diff) | |
| parent | build: add missing leveldb defines (diff) | |
| download | discoin-90b1c7e5c50551f39d4983008d1d5ab3b085803e.tar.xz discoin-90b1c7e5c50551f39d4983008d1d5ab3b085803e.zip | |
Merge #13659: build: add missing leveldb defines
768981c93d 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
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index bf0f3f8f5..2b4bc4319 100644 --- a/configure.ac +++ b/configure.ac @@ -541,10 +541,17 @@ case $host in CPPFLAGS="$CPPFLAGS -DMAC_OSX" OBJCXXFLAGS="$CXXFLAGS" ;; + *android*) + dnl make sure android stays above linux for hosts like *linux-android* + LEVELDB_TARGET_FLAGS="-DOS_ANDROID" + ;; *linux*) TARGET_OS=linux LEVELDB_TARGET_FLAGS="-DOS_LINUX" ;; + *kfreebsd*) + LEVELDB_TARGET_FLAGS="-DOS_KFREEBSD" + ;; *freebsd*) LEVELDB_TARGET_FLAGS="-DOS_FREEBSD" ;; @@ -554,10 +561,17 @@ case $host in *netbsd*) LEVELDB_TARGET_FLAGS="-DOS_NETBSD" ;; + *dragonfly*) + LEVELDB_TARGET_FLAGS="-DOS_DRAGONFLYBSD" + ;; + *solaris*) + LEVELDB_TARGET_FLAGS="-DOS_SOLARIS" + ;; + *hpux*) + LEVELDB_TARGET_FLAGS="-DOS_HPUX" + ;; *) - OTHER_OS=`echo ${host_os} | awk '{print toupper($0)}'` - AC_MSG_WARN([Guessing LevelDB OS as OS_${OTHER_OS}, please check whether this is correct, if not add an entry to configure.ac.]) - LEVELDB_TARGET_FLAGS="-DOS_${OTHER_OS}" + AC_MSG_ERROR(Cannot build leveldb for $host. Please file a bug report.) ;; esac |