Skip to content

Commit 4daf124

Browse files
committed
[lumen] update release build to debian10
1 parent 6baeade commit 4daf124

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

lumen/Dockerfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
#===----------------------------------------------------------------------===//
88
# Stage 1. Check out LLVM source code and run the build.
9-
FROM launcher.gcr.io/google/debian9:latest AS builder
9+
FROM launcher.gcr.io/google/debian10:latest AS builder
1010
LABEL maintainer "Lumen Developers"
1111

1212
# Install build dependencies of llvm.
@@ -18,25 +18,23 @@ RUN grep deb /etc/apt/sources.list | \
1818
# LLDB doesn't build with Swig 3.0.9-10
1919
RUN apt-get update && \
2020
apt-get install -y --no-install-recommends \
21-
ca-certificates \
22-
gnupg \
2321
build-essential \
22+
ca-certificates \
2423
chrpath \
24+
file \
25+
gcc-multilib \
26+
git \
27+
gnupg \
2528
libedit-dev \
29+
libncurses6-dev \
2630
libxml2-dev \
27-
libncurses5-dev \
28-
python2.7-dev \
31+
make \
2932
python3 \
3033
python3-dev \
31-
file \
32-
python \
34+
swig \
35+
unzip \
3336
wget \
34-
git \
35-
unzip && \
36-
wget "http://http.us.debian.org/debian/pool/main/s/swig/swig_3.0.12-2_amd64.deb" && \
37-
wget "http://http.us.debian.org/debian/pool/main/s/swig/swig3.0_3.0.12-2_amd64.deb" && \
38-
dpkg -i swig3.0_3.0.12-2_amd64.deb && \
39-
dpkg -i swig_3.0.12-2_amd64.deb && \
37+
zlib1g && \
4038
rm -rf /var/lib/apt/lists/*
4139

4240
# Install a newer ninja release. It seems the older version in the debian repos
@@ -93,13 +91,13 @@ FROM scratch AS dist
9391
COPY --from=stage1 /tmp/dist /opt/dist
9492

9593
# Stage 2. Produce a minimal release image with build results.
96-
FROM launcher.gcr.io/google/debian9:latest AS release
94+
FROM launcher.gcr.io/google/debian10:latest AS release
9795
LABEL maintainer "Lumen Developers"
9896

9997
# Install packages for minimal useful image.
10098
RUN apt-get update && \
10199
apt-get install -y --no-install-recommends \
102-
libstdc++-4.9-dev \
100+
libstdc++-6-dev \
103101
binutils && \
104102
rm -rf /var/lib/apt/lists/*
105103
# Copy build results of stage 1 to /usr/local.

lumen/utils/dist/build-dist.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,14 @@ function configure_core() {
385385
local stage_runtimes="$enable_runtimes"
386386

387387
if [ "1" = "$current_stage" ]; then
388-
stage_targets="X86"
388+
stage_targets="Native"
389389
stage_link_dylib="OFF"
390390
stage_build_dylib="OFF"
391391
stage_build_shared="OFF"
392392
stage_install_toolchain_only="ON"
393393
stage_projects="clang;clang-tools-extra;lld"
394394
stage_runtimes="compiler-rt;libcxx;libcxxabi"
395+
extra_configure_flags="-DBOOTSTRAP_CMAKE_BUILD_TYPE=Release -DCLANG_ENABLE_BOOTSTRAP=ON -DCLANG_BOOTSTRAP_TARGETS=\"install-clang;install-clang-resource-headers\""
395396
else
396397
extra_configure_flags="-DLLVM_BUILD_UTILS=ON -DLLVM_INSTALL_UTILS=ON $extra_configure_flags"
397398
if [[ ! "$triple" =~ apple ]]; then
@@ -516,13 +517,6 @@ function build_core() {
516517
echo "# cp -f bin/not \"${dest_dir}/usr/local/bin/\""
517518
cp -f bin/not "${dest_dir}/usr/local/bin/"
518519

519-
pushd "${dest_dir}/usr/local/lib"
520-
521-
_major_version="$(echo "${release}" | cut -d. -f1)"
522-
ln -sf libLLVM.dylib "libLLVM-${_major_version}-lumen-${release}".dylib
523-
524-
popd
525-
526520
cd "$build_dir"
527521
}
528522

0 commit comments

Comments
 (0)