thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Freebsd fixes: fix build with libc++, fix find system lib double-conversion (#1109)

Browse Source 
* Cmake: Don't detect and use -no-pie flag with clang

* Camke: find_unwind: Fix disable on arm

* Freebsd fixes: fix build with libc++, fix find system lib double-conversion
This commit is contained in:
proller 2017-08-17 00:01:43 +03:00 committed by alexey-milovidov
parent 16d6c4f9e7
commit 175cd99288
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Modules/Finddouble-conversion.cmake
View File

@ -18,7 +18,7 @@
# DOUBLE_CONVERSION_INCLUDE_DIR The location of double-conversion headers
find_path(DOUBLE_CONVERSION_ROOT_DIR
NAMES include/double-conversion.h
NAMES include/double-conversion/double-conversion.h
)
find_library(DOUBLE_CONVERSION_LIBRARIES
@ -27,7 +27,7 @@ find_library(DOUBLE_CONVERSION_LIBRARIES
)
find_path(DOUBLE_CONVERSION_INCLUDE_DIR
NAMES double-conversion.h
NAMES double-conversion/double-conversion.h
PATHS ${DOUBLE_CONVERSION_ROOT_DIR}/include ${DOUBLE_CONVERSION_INCLUDE_PATHS}
)

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
View File

@ -247,7 +247,7 @@ void ReplicatedMergeTreeCleanupThread::getBlocksSortedByTime(zkutil::ZooKeeperPt
if (!status.exists)
throw zkutil::KeeperException("A block node was suddenly deleted", ZNONODE);
cached_block_stats->emplace(elem.first, status.stat);
cached_block_stats->emplace(elem.first, RequiredStat(status.stat));
timed_blocks.emplace_back(elem.first, RequiredStat(status.stat));
}