Browse Source

Fixup for bad -mt patch.

cl-refactor
Gav Wood 11 years ago
parent
commit
0a9be840bd
  1. 6
      libethereum/CMakeLists.txt
  2. 2
      libethereum/Client.cpp

6
libethereum/CMakeLists.txt

@ -41,9 +41,9 @@ elseif (APPLE)
target_link_libraries(ethereum ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(ethereum ${CMAKE_THREAD_LIBS_INIT})
else () else ()
target_link_libraries(ethereum ${CRYPTOPP_LIBRARIES}) target_link_libraries(ethereum ${CRYPTOPP_LIBRARIES})
target_link_libraries(ethereum boost_system-mt) target_link_libraries(ethereum boost_system)
target_link_libraries(ethereum boost_filesystem-mt) target_link_libraries(ethereum boost_filesystem)
target_link_libraries(ethereum boost_thread-mt) target_link_libraries(ethereum boost_thread)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
target_link_libraries(ethereum ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(ethereum ${CMAKE_THREAD_LIBS_INIT})
endif () endif ()

2
libethereum/Client.cpp

@ -137,6 +137,7 @@ void Client::work()
lock_guard<mutex> l(m_lock); lock_guard<mutex> l(m_lock);
if (m_s.sync(m_bc)) if (m_s.sync(m_bc))
{ {
cnote << "Externally mined block: Restarting mining operation.";
changed = true; changed = true;
m_miningStarted = true; // need to re-commit to mine. m_miningStarted = true; // need to re-commit to mine.
if (!m_doMine) if (!m_doMine)
@ -144,6 +145,7 @@ void Client::work()
} }
if (m_mined.sync(m_tq)) if (m_mined.sync(m_tq))
{ {
cnote << "Additional transaction ready: Restarting mining operation.";
changed = true; changed = true;
m_miningStarted = true; m_miningStarted = true;
} }

Loading…
Cancel
Save