Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
6cc2f8da
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6cc2f8da
编写于
9月 23, 2019
作者:
I
Ivan Lezhankin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add 'clang-8-darwin' choise and update Docker build image.
上级
ce2fb6d3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
3 deletion
+26
-3
docker/packager/binary/Dockerfile
docker/packager/binary/Dockerfile
+17
-1
docker/packager/packager
docker/packager/packager
+9
-2
未找到文件。
docker/packager/binary/Dockerfile
浏览文件 @
6cc2f8da
...
...
@@ -57,7 +57,23 @@ RUN apt-get update -y \
gperf
\
cmake
\
gdb
\
rename
rename
\
wget
# Build and install tools for cross-linking to Darwin
ENV
CC=clang-8
ENV
CXX=clang++-8
# libtapi is required to support .tbh format from recent MacOS SDKs
RUN
git clone https://github.com/tpoechtrager/apple-libtapi.git
RUN
cd
apple-libtapi
&&
INSTALLPREFIX
=
/cctools ./build.sh
&&
./install.sh
RUN
git clone https://github.com/tpoechtrager/cctools-port.git
RUN
cd
cctools-port/cctools
&&
./configure
--prefix
=
/cctools
--with-libtapi
=
/cctools
--target
=
x86_64-apple-darwin
&&
make
install
RUN
wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/MacOSX10.14.sdk.tar.xz
RUN
tar
xJf MacOSX10.14.sdk.tar.xz
-C
/cctools
COPY
build.sh /
CMD
["/bin/bash", "/build.sh"]
docker/packager/packager
浏览文件 @
6cc2f8da
...
...
@@ -118,6 +118,13 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, cache, di
cmake_flags
.
append
(
'-DCMAKE_C_COMPILER=`which {}`'
.
format
(
cc
))
cmake_flags
.
append
(
'-DCMAKE_CXX_COMPILER=`which {}`'
.
format
(
cxx
))
if
"darwin"
in
compiler
:
cmake_flags
.
append
(
"-DCMAKE_AR:FILEPATH=/cctools/bin/x86_64-apple-darwin-ar"
)
\
.
append
(
"-DCMAKE_RANLIB:FILEPATH=/cctools/bin/x86_64-apple-darwin-ranlib"
)
\
.
append
(
"-DCMAKE_SYSTEM_NAME=Darwin"
)
\
.
append
(
"-DSDK_PATH=/cctools/MacOSX10.14.sdk"
)
\
.
append
(
"-DLINKER_NAME=/cctools/bin/x86_64-apple-darwin-ld"
)
if
sanitizer
:
result
.
append
(
"SANITIZER={}"
.
format
(
sanitizer
))
if
build_type
:
...
...
@@ -166,12 +173,12 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, cache, di
if
__name__
==
"__main__"
:
logging
.
basicConfig
(
level
=
logging
.
INFO
,
format
=
'%(asctime)s %(message)s'
)
parser
=
argparse
.
ArgumentParser
(
description
=
"ClickHouse building script
via virtualization mechanisms
"
)
parser
=
argparse
.
ArgumentParser
(
description
=
"ClickHouse building script
using prebuilt Docker image
"
)
parser
.
add_argument
(
"--package-type"
,
choices
=
IMAGE_MAP
.
keys
(),
required
=
True
)
parser
.
add_argument
(
"--clickhouse-repo-path"
,
default
=
"../../"
)
parser
.
add_argument
(
"--output-dir"
,
required
=
True
)
parser
.
add_argument
(
"--build-type"
,
choices
=
(
"debug"
,
""
),
default
=
""
)
parser
.
add_argument
(
"--compiler"
,
choices
=
(
"clang-6.0"
,
"clang-7"
,
"gcc-7"
,
"clang-8"
,
"gcc-8"
,
"gcc-9"
),
default
=
"gcc-7"
)
parser
.
add_argument
(
"--compiler"
,
choices
=
(
"clang-6.0"
,
"clang-7"
,
"gcc-7"
,
"clang-8"
,
"
clang-8-darwin"
,
"
gcc-8"
,
"gcc-9"
),
default
=
"gcc-7"
)
parser
.
add_argument
(
"--sanitizer"
,
choices
=
(
"address"
,
"thread"
,
"memory"
,
"undefined"
,
""
),
default
=
""
)
parser
.
add_argument
(
"--unbundled"
,
action
=
"store_true"
)
parser
.
add_argument
(
"--split-binary"
,
action
=
"store_true"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录