Link errors after hhvm-third-party sha update because of folly::Singleton move from experimental

gistfile1.txt

Linking CXX executable hhvm
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/ProxyRequestContext.cpp:155: error: undefined reference to 'folly::fibers::Baton::post()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/ProxyRequestContext.cpp:155: error: undefined reference to 'folly::fibers::Baton::post()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:123: error: undefined reference to 'folly::fibers::FiberManager::currentFiberManager_'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:123: error: undefined reference to 'folly::fibers::FiberManager::currentFiberManager_'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:97: error: undefined reference to 'folly::fibers::Fiber::LocalData::reset()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:103: error: undefined reference to 'folly::fibers::Fiber::~Fiber()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:126: error: undefined reference to 'folly::fibers::FiberManager::currentFiberManager_'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:148: error: undefined reference to 'folly::fibers::FiberManager::getFiber()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:150: error: undefined reference to 'folly::fibers::Fiber::LocalData::operator=(folly::fibers::Fiber::LocalData const&)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/async.cpp:86: error: undefined reference to 'folly::fibers::FiberManager::hasTasks() const'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/async.cpp:103: error: undefined reference to 'folly::fibers::FiberManager::hasTasks() const'
/home/joelm/local/hhvm-push/third-party/folly/folly/Memory.h:43: error: undefined reference to 'folly::fibers::Fiber::LocalData::LocalData(folly::fibers::Fiber::LocalData const&)'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:403: error: undefined reference to 'folly::fibers::FiberManager::currentFiberManager_'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:394: error: undefined reference to 'folly::fibers::Fiber::preempt(folly::fibers::Fiber::State)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/async.cpp:57: error: undefined reference to 'folly::fibers::FiberManager::FiberManager(std::unique_ptr<folly::fibers::LoopController, std::default_delete<folly::fibers::LoopController> >, folly::fibers::FiberManager::Options)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/async.cpp:58: error: undefined reference to 'folly::fibers::FiberManager::loopController()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/async.cpp:57: error: undefined reference to 'folly::fibers::FiberManager::~FiberManager()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/async.cpp:65: error: undefined reference to 'folly::fibers::FiberManager::hasTasks() const'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/async.cpp:63: error: undefined reference to 'folly::fibers::FiberManager::~FiberManager()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/ProxyThread.cpp:66: error: undefined reference to 'folly::fibers::FiberManager::hasTasks() const'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:327: error: undefined reference to 'folly::fibers::FiberManager::getFiber()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:434: error: undefined reference to 'folly::fibers::Fiber::LocalData::operator=(folly::fibers::Fiber::LocalData const&)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/proxy.cpp:118: error: undefined reference to 'folly::fibers::FiberManager::loopController()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/proxy.cpp:141: error: undefined reference to 'folly::fibers::FiberManager::setObserver(folly::fibers::ExecutionObserver*)'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:460: error: undefined reference to 'vtable for folly::fibers::FiberManager'
/opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../../../include/c++/4.8.2/ext/new_allocator.h:120: error: undefined reference to 'folly::fibers::TimeoutController::TimeoutController(folly::fibers::LoopController&)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/proxy.cpp:93: error: undefined reference to 'folly::fibers::FiberManager::~FiberManager()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/proxy.cpp:171: error: undefined reference to 'folly::fibers::FiberManager::~FiberManager()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:394: error: undefined reference to 'folly::fibers::Fiber::preempt(folly::fibers::Fiber::State)'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/ForEach-inl.h:65: error: undefined reference to 'folly::fibers::Baton::post()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/ForEach-inl.h:65: error: undefined reference to 'folly::fibers::Baton::post()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:204: error: undefined reference to 'folly::fibers::FiberManager::getFiber()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:434: error: undefined reference to 'folly::fibers::Fiber::LocalData::operator=(folly::fibers::Fiber::LocalData const&)'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/ForEach-inl.h:81: error: undefined reference to 'folly::fibers::Baton::wait()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/stats.cpp:386: error: undefined reference to 'folly::fibers::FiberManager::fibersAllocated() const'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/stats.cpp:388: error: undefined reference to 'folly::fibers::FiberManager::fibersPoolSize() const'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/stats.cpp:391: error: undefined reference to 'folly::fibers::FiberManager::stackHighWatermark() const'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:204: error: undefined reference to 'folly::fibers::FiberManager::getFiber()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:434: error: undefined reference to 'folly::fibers::Fiber::LocalData::operator=(folly::fibers::Fiber::LocalData const&)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<3>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:88: error: undefined reference to 'folly::fibers::Baton::timed_wait(std::chrono::duration<long, std::ratio<1l, 1000000000l> >)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:90: error: undefined reference to 'folly::fibers::Baton::wait()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:97: error: undefined reference to 'folly::fibers::Baton::reset()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:98: error: undefined reference to 'folly::fibers::Baton::wait()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:105: error: undefined reference to 'folly::fibers::Baton::reset()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:106: error: undefined reference to 'folly::fibers::Baton::wait()'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:394: error: undefined reference to 'folly::fibers::Fiber::preempt(folly::fibers::Fiber::State)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<15>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<8>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<11>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<14>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<23>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<25>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<13>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<7>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<20>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<6>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<12>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<19>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/ClientMcParser-inl.h:64: error: undefined reference to 'void facebook::memcache::McAsciiParser::initializeReplyParser<facebook::memcache::McOperation<5>, facebook::memcache::McRequest>()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:88: error: undefined reference to 'folly::fibers::Baton::timed_wait(std::chrono::duration<long, std::ratio<1l, 1000000000l> >)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:97: error: undefined reference to 'folly::fibers::Baton::reset()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:105: error: undefined reference to 'folly::fibers::Baton::reset()'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:88: error: undefined reference to 'folly::fibers::Baton::timed_wait(std::chrono::duration<long, std::ratio<1l, 1000000000l> >)'
/home/joelm/local/hhvm-push/third-party/mcrouter/mcrouter/lib/network/McClientRequestContext-inl.h:88: error: undefined reference to 'folly::fibers::Baton::timed_wait(std::chrono::duration<long, std::ratio<1l, 1000000000l> >)'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/FiberManager-inl.h:378: error: undefined reference to 'folly::fibers::Fiber::preempt(folly::fibers::Fiber::State)'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/Baton-inl.h:52: error: undefined reference to 'folly::fibers::Fiber::setData(long)'
/home/joelm/local/hhvm-push/third-party/folly/folly/experimental/fibers/Baton-inl.h:37: error: undefined reference to 'folly::fibers::Baton::waitThread()'
collect2: error: ld returned 1 exit status
make[2]: *** [hphp/hhvm/hhvm] Error 1
make[1]: *** [hphp/hhvm/CMakeFiles/hhvm.dir/all] Error 2
make: *** [all] Error 2