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

Addition to prev. revision [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-05-14 23:41:50 +03:00
parent 7edae47282
commit 28a4513ec3
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/install-os-packages.sh
View File

@ -78,9 +78,11 @@ case $PACKAGE_MANAGER in
;; ;;
gcc*) gcc*)
$SUDO pkg install -y ${WHAT/-/} $SUDO pkg install -y ${WHAT/-/}
export COMPILER_PATH=/usr/local/bin # Otherwise ld cannot link some binaries.
;; ;;
clang*) clang*)
$SUDO pkg install -y clang-devel $SUDO pkg install -y clang-devel
export COMPILER_PATH=/usr/local/bin
;; ;;
git) git)
$SUDO pkg install -y git $SUDO pkg install -y git

2
ci/run-with-vagrant.sh
View File

@ -8,7 +8,7 @@ pushd vagrant-$1
shopt -s extglob shopt -s extglob
vagrant ssh -c "mkdir -p ClickHouse" vagrant ssh -c "mkdir -p ClickHouse"
scp -F vagrant-ssh -r ../../!(*build*) default:~/ClickHouse scp -q -F vagrant-ssh -r ../../!(*build*) default:~/ClickHouse
vagrant ssh -c "cd ClickHouse/ci; $2" vagrant ssh -c "cd ClickHouse/ci; $2"
popd popd

3
cmake/find_execinfo.cmake
View File

@ -1,6 +1,9 @@
if (ARCH_FREEBSD) if (ARCH_FREEBSD)
find_library (EXECINFO_LIBRARY execinfo) find_library (EXECINFO_LIBRARY execinfo)
find_library (ELF_LIBRARY elf)
message (STATUS "Using execinfo: ${EXECINFO_LIBRARY}") message (STATUS "Using execinfo: ${EXECINFO_LIBRARY}")
message (STATUS "Using elf: ${ELF_LIBRARY}")
else () else ()
set (EXECINFO_LIBRARY "") set (EXECINFO_LIBRARY "")
set (ELF_LIBRARY "")
endif () endif ()