File tree 2 files changed +33
-2
lines changed
host-x86_64/dist-x86_64-linux
2 files changed +33
-2
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
12
12
RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
13
13
14
14
RUN yum upgrade -y && \
15
- yum install -y epel-release && \
16
15
yum install -y \
17
16
automake \
18
17
bzip2 \
@@ -25,7 +24,6 @@ RUN yum upgrade -y && \
25
24
libedit-devel \
26
25
libstdc++-devel.i686 \
27
26
libstdc++-devel.x86_64 \
28
- libzstd-static.x86_64 \
29
27
make \
30
28
ncurses-devel \
31
29
openssl-devel \
@@ -58,6 +56,10 @@ RUN ./build-gcc.sh && yum remove -y gcc gcc-c++
58
56
COPY scripts/cmake.sh /tmp/
59
57
RUN ./cmake.sh
60
58
59
+ # rustc's LLVM needs zstd.
60
+ COPY scripts/zstd.sh /tmp/
61
+ RUN ./zstd.sh
62
+
61
63
# Now build LLVM+Clang, afterwards configuring further compilations to use the
62
64
# clang/clang++ compilers.
63
65
COPY host-x86_64/dist-x86_64-linux/build-clang.sh /tmp/
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+ set -ex
3
+
4
+ hide_output () {
5
+ set +x
6
+ on_err="
7
+ echo ERROR: An error was encountered with the build.
8
+ cat /tmp/zstd_build.log
9
+ exit 1
10
+ "
11
+ trap " $on_err " ERR
12
+ bash -c " while true; do sleep 30; echo \$ (date) - building ...; done" &
13
+ PING_LOOP_PID=$!
14
+ " $@ " & > /tmp/zstd_build.log
15
+ trap - ERR
16
+ kill $PING_LOOP_PID
17
+ rm /tmp/zstd_build.log
18
+ set -x
19
+ }
20
+
21
+ ZSTD=1.5.6
22
+ curl -L https://github.com/facebook/zstd/releases/download/v$ZSTD /zstd-$ZSTD .tar.gz | tar xzf -
23
+
24
+ cd zstd-$ZSTD
25
+ CFLAGS=-fPIC hide_output make -j$( nproc) VERBOSE=1
26
+ hide_output make install
27
+
28
+ cd ..
29
+ rm -rf zstd-$ZSTD
You can’t perform that action at this time.
0 commit comments