From 28a4513ec3160accb348b3c4a7ff616d45b10c68 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 14 May 2018 23:41:50 +0300
Subject: [PATCH] Addition to prev. revision [#CLICKHOUSE-2]

---
 ci/install-os-packages.sh | 2 ++
 ci/run-with-vagrant.sh    | 2 +-
 cmake/find_execinfo.cmake | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/install-os-packages.sh b/ci/install-os-packages.sh
index e3e7e88044a..9198f64852d 100755
--- a/ci/install-os-packages.sh
+++ b/ci/install-os-packages.sh
@@ -78,9 +78,11 @@ case $PACKAGE_MANAGER in
                 ;;
             gcc*)
                 $SUDO pkg install -y ${WHAT/-/}
+                export COMPILER_PATH=/usr/local/bin     # Otherwise ld cannot link some binaries.
                 ;;
             clang*)
                 $SUDO pkg install -y clang-devel
+                export COMPILER_PATH=/usr/local/bin
                 ;;
             git)
                 $SUDO pkg install -y git
diff --git a/ci/run-with-vagrant.sh b/ci/run-with-vagrant.sh
index 2568292847f..620d38071eb 100755
--- a/ci/run-with-vagrant.sh
+++ b/ci/run-with-vagrant.sh
@@ -8,7 +8,7 @@ pushd vagrant-$1
 shopt -s extglob
 
 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"
 
 popd
diff --git a/cmake/find_execinfo.cmake b/cmake/find_execinfo.cmake
index 6d7428a166f..05dd72dbb3d 100644
--- a/cmake/find_execinfo.cmake
+++ b/cmake/find_execinfo.cmake
@@ -1,6 +1,9 @@
 if (ARCH_FREEBSD)
     find_library (EXECINFO_LIBRARY execinfo)
+    find_library (ELF_LIBRARY elf)
     message (STATUS "Using execinfo: ${EXECINFO_LIBRARY}")
+    message (STATUS "Using elf: ${ELF_LIBRARY}")
 else ()
     set (EXECINFO_LIBRARY "")
+    set (ELF_LIBRARY "")
 endif ()