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

Merge pull request #823 from proller/fix

Browse Source 
Fix clang finding in release script
This commit is contained in:
alexey-milovidov 2017-05-24 16:42:41 +04:00 committed by GitHub
commit 93b80b740a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/copy_clang_binaries.sh vendored
View File

@ -7,6 +7,10 @@ DST=${1:-.};
PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:$PATH" PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:$PATH"
LD=$(command -v gold || command -v ld.gold || command -v ld) LD=$(command -v gold || command -v ld.gold || command -v ld)
if [ -z "$CLANG" ]; then
CLANG=$(which clang)
fi
if [ ! -x "$CLANG" ]; then if [ ! -x "$CLANG" ]; then
echo "Not found executable clang." echo "Not found executable clang."
exit 1 exit 1

2
debian/rules vendored
View File

@ -21,7 +21,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_CC ?= gcc-6 DEB_CC ?= gcc-6
DEB_CXX ?= g++-6 DEB_CXX ?= g++-6
DEB_CLANG ?= $(shell command -v clang) DEB_CLANG ?= $(shell which clang)
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)