File tree 4 files changed +36
-24
lines changed
src/ci/docker/dist-powerpc64-linux
4 files changed +36
-24
lines changed Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ USER rustbuild
61
61
WORKDIR /tmp
62
62
63
63
COPY patches/ /tmp/patches/
64
- COPY powerpc64-linux-gnu.config build-powerpc64-toolchain.sh /tmp/
64
+ COPY shared.sh powerpc64-linux-gnu.config build-powerpc64-toolchain.sh /tmp/
65
65
RUN ./build-powerpc64-toolchain.sh
66
66
67
67
USER root
Original file line number Diff line number Diff line change 11
11
12
12
set -ex
13
13
14
- hide_output () {
15
- set +x
16
- on_err="
17
- echo ERROR: An error was encountered with the build.
18
- cat /tmp/build.log
19
- exit 1
20
- "
21
- trap " $on_err " ERR
22
- bash -c " while true; do sleep 30; echo \$ (date) - building ...; done" &
23
- PING_LOOP_PID=$!
24
- $@ & > /tmp/build.log
25
- rm /tmp/build.log
26
- trap - ERR
27
- kill $PING_LOOP_PID
28
- set -x
29
- }
14
+ source shared.sh
30
15
31
16
mkdir build
32
17
cd build
Original file line number Diff line number Diff line change 11
11
12
12
set -ex
13
13
14
+ source shared.sh
15
+
14
16
BINUTILS=2.25.1
15
17
GCC=5.3.0
16
18
TARGET=powerpc64le-linux-gnu
@@ -40,9 +42,9 @@ pushd binutils-$TARGET
40
42
curl https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS .tar.bz2 | tar xjf -
41
43
mkdir binutils-build
42
44
cd binutils-build
43
- ../binutils-$BINUTILS /configure --target=$TARGET --with-sysroot=$SYSROOT
44
- make -j10
45
- make install
45
+ hide_output ../binutils-$BINUTILS /configure --target=$TARGET --with-sysroot=$SYSROOT
46
+ hide_output make -j10
47
+ hide_output make install
46
48
popd
47
49
rm -rf binutils-$TARGET
48
50
@@ -51,11 +53,11 @@ mkdir gcc-$TARGET
51
53
pushd gcc-$TARGET
52
54
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC /gcc-$GCC .tar.bz2 | tar xjf -
53
55
cd gcc-$GCC
54
- ./contrib/download_prerequisites
56
+ hide_output ./contrib/download_prerequisites
55
57
56
58
mkdir ../gcc-build
57
59
cd ../gcc-build
58
- ../gcc-$GCC /configure \
60
+ hide_output ../gcc-$GCC /configure \
59
61
--enable-languages=c,c++ \
60
62
--target=$TARGET \
61
63
--with-cpu=power8 \
@@ -72,8 +74,8 @@ cd ../gcc-build
72
74
--disable-libsanitizer \
73
75
--disable-libquadmath-support \
74
76
--disable-lto
75
- make -j10
76
- make install
77
+ hide_output hide_output make -j10
78
+ hide_output make install
77
79
78
80
popd
79
81
rm -rf gcc-$TARGET
Original file line number Diff line number Diff line change
1
+ # Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2
+ # file at the top-level directory of this distribution and at
3
+ # http://rust-lang.org/COPYRIGHT.
4
+ #
5
+ # Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6
+ # http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7
+ # <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8
+ # option. This file may not be copied, modified, or distributed
9
+ # except according to those terms.
10
+
11
+ hide_output () {
12
+ set +x
13
+ on_err="
14
+ echo ERROR: An error was encountered with the build.
15
+ cat /tmp/build.log
16
+ exit 1
17
+ "
18
+ trap " $on_err " ERR
19
+ bash -c " while true; do sleep 30; echo \$ (date) - building ...; done" &
20
+ PING_LOOP_PID=$!
21
+ $@ & > /tmp/build.log
22
+ trap - ERR
23
+ kill $PING_LOOP_PID
24
+ set -x
25
+ }
You can’t perform that action at this time.
0 commit comments