mirror of
https://github.com/monero-project/monero.git
synced 2026-07-30 23:50:24 -07:00
Merge pull request #4470
2fbf38eeFix 32bit depends builds (TheCharlatan)17142ec9malloc scratchpad for all supported android archs (m2049r)6a781408Make depends use self built clang for darwin (TheCharlatan)69da14e1fixes make debug compilation on OSX (Dusan Klinec)fe125647Fixup RENAME_DB() macro (Howard Chu)b2972927osx compilation fix: missing boost libs added (Dusan Klinec)174f31bfsimplewallet: don't complain about payment id on pool mined blocks (moneromooo-monero)89288863README: mention ASAN usage alongside valgrind (moneromooo-monero)83debef9wallet_rpc_server: remove verbose field in incoming_transfers query (moneromooo-monero)a69271faFixed a typo (Piotr Kąkol)92d1da28unit_tests: fix build with GCC 5.4.0 on ubuntu (moneromooo-monero)a21da905Wallet: use unique_ptr for WalletImpl members (oneiric)7a056f44WalletAPI: multisigSignData bug fixed (naughtyfox)43a06350ringdb: use cursors to be a bit faster (moneromooo-monero)7964d4f8wallet2: handle corner case in picking fake outputs (moneromooo-monero)6f5360b3bump version to 0.13.0.1 (Riccardo Spagni)cf470bf3switch from master to rc (Riccardo Spagni)
This commit is contained in:
@@ -78,5 +78,9 @@ elseif(ARCHITECTURE STREQUAL "aarch64")
|
||||
set(BUILD_64 ON)
|
||||
endif()
|
||||
|
||||
if(ARCHITECTURE STREQUAL "i686" AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
SET(LINUX_32 ON)
|
||||
endif()
|
||||
|
||||
#Create a new global cmake flag that indicates building with depends
|
||||
set (DEPENDS true)
|
||||
|
||||
Reference in New Issue
Block a user