diff --git a/cmake/find_llvm.cmake b/cmake/find_llvm.cmake
index a2006e37c64b8468b9a3dd288073a2fb5e432cd0..22195c85f2f832f656f6e976dc4b9167edcc3d95 100644
--- a/cmake/find_llvm.cmake
+++ b/cmake/find_llvm.cmake
@@ -1,5 +1,5 @@
 option (ENABLE_EMBEDDED_COMPILER "Set to TRUE to enable support for 'compile' option for query execution" 1)
-option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library. Default: system library for quicker developer builds." 0)
+option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library. Default: system library for quicker developer builds." ${APPLE})
 
 if (ENABLE_EMBEDDED_COMPILER)
     if (USE_INTERNAL_LLVM_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt")
diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt
index da19916399481669588e4fe195cb7bd4886946aa..45695beb9c1f3d4754b6fb1484facc01ff81607f 100644
--- a/dbms/CMakeLists.txt
+++ b/dbms/CMakeLists.txt
@@ -104,9 +104,7 @@ if (USE_EMBEDDED_COMPILER)
     if (TERMCAP_LIBRARY)
         list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
     endif ()
-    if (LTDL_LIBRARY)
-        list(APPEND REQUIRED_LLVM_LIBRARIES ${LTDL_LIBRARY})
-    endif ()
+    list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
 
     target_link_libraries (dbms ${REQUIRED_LLVM_LIBRARIES})
     target_include_directories (dbms BEFORE PUBLIC ${LLVM_INCLUDE_DIRS})
diff --git a/dbms/src/Server/Compiler-5.0.0/CMakeLists.txt b/dbms/src/Server/Compiler-5.0.0/CMakeLists.txt
index 076eef6921d2e4773e8ba78928fe52c9be5139b3..5a29d3bd8ae3ecc445046cd1febb2914fdf509be 100644
--- a/dbms/src/Server/Compiler-5.0.0/CMakeLists.txt
+++ b/dbms/src/Server/Compiler-5.0.0/CMakeLists.txt
@@ -12,9 +12,8 @@ llvm_map_components_to_libnames(REQUIRED_LLVM_LIBRARIES all)
 if (TERMCAP_LIBRARY)
     list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
 endif ()
-if (LTDL_LIBRARY)
-    list(APPEND REQUIRED_LLVM_LIBRARIES ${LTDL_LIBRARY})
-endif ()
+list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
+
 
 message(STATUS "Using LLVM ${LLVM_VERSION}: ${LLVM_INCLUDE_DIRS} : ${REQUIRED_LLVM_LIBRARIES}")
 
diff --git a/dbms/src/Server/Compiler-6.0.0/CMakeLists.txt b/dbms/src/Server/Compiler-6.0.0/CMakeLists.txt
index 23c7ea61c31e3ca440f738f6398edf3dd6787b46..d7123ea3f07dd9e3114faff18bb6a165a933edff 100644
--- a/dbms/src/Server/Compiler-6.0.0/CMakeLists.txt
+++ b/dbms/src/Server/Compiler-6.0.0/CMakeLists.txt
@@ -12,9 +12,7 @@ llvm_map_components_to_libnames(REQUIRED_LLVM_LIBRARIES all)
 if (TERMCAP_LIBRARY)
     list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
 endif ()
-if (LTDL_LIBRARY)
-    list(APPEND REQUIRED_LLVM_LIBRARIES ${LTDL_LIBRARY})
-endif ()
+list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
 
 message(STATUS "Using LLVM ${LLVM_VERSION}: ${LLVM_INCLUDE_DIRS} : ${REQUIRED_LLVM_LIBRARIES}")
 
diff --git a/dbms/src/Server/Compiler-7.0.0/CMakeLists.txt b/dbms/src/Server/Compiler-7.0.0/CMakeLists.txt
index 809f8604366ec3e3cd77754eb0bb132c3306f474..15f6234dfa9002ddbff188b4131149596bb36239 100644
--- a/dbms/src/Server/Compiler-7.0.0/CMakeLists.txt
+++ b/dbms/src/Server/Compiler-7.0.0/CMakeLists.txt
@@ -12,9 +12,8 @@ llvm_map_components_to_libnames(REQUIRED_LLVM_LIBRARIES all)
 if (TERMCAP_LIBRARY)
     list(APPEND REQUIRED_LLVM_LIBRARIES ${TERMCAP_LIBRARY})
 endif ()
-if (LTDL_LIBRARY)
-    list(APPEND REQUIRED_LLVM_LIBRARIES ${LTDL_LIBRARY})
-endif ()
+list(APPEND REQUIRED_LLVM_LIBRARIES ${CMAKE_DL_LIBS})
+
 
 message(STATUS "Using LLVM ${LLVM_VERSION}: ${LLVM_INCLUDE_DIRS} : ${REQUIRED_LLVM_LIBRARIES}")
 
diff --git a/debian/pbuilder-hooks/A00ccache b/debian/pbuilder-hooks/A00ccache
index a5d1d33b428644e4eb44417b633a80d495b7ab6c..b8bf8d579c0d85c52bdaa110cb00d1c050f9ed85 100755
--- a/debian/pbuilder-hooks/A00ccache
+++ b/debian/pbuilder-hooks/A00ccache
@@ -12,5 +12,6 @@ if [ -n "$CCACHE_DIR" ]; then
     chmod -R a+rwx $CCACHE_DIR || true
 fi
 
+df -h
 ccache --show-stats
 ccache -M ${CCACHE_SIZE:=32G}