File tree 3 files changed +17
-12
lines changed
3 files changed +17
-12
lines changed Original file line number Diff line number Diff line change @@ -221,8 +221,9 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
221
221
let run = |cmd : & mut Command | {
222
222
cmd. output ( ) . map ( |output| {
223
223
String :: from_utf8_lossy ( & output. stdout )
224
- . lines ( ) . next ( ) . unwrap ( )
225
- . to_string ( )
224
+ . lines ( ) . next ( ) . unwrap_or_else ( || {
225
+ panic ! ( "{:?} failed {:?}" , cmd, output)
226
+ } ) . to_string ( )
226
227
} )
227
228
} ;
228
229
build. lldb_version = run ( Command :: new ( "lldb" ) . arg ( "--version" ) ) . ok ( ) ;
Original file line number Diff line number Diff line change 1
1
FROM ubuntu:16.04
2
2
3
- RUN apt-get update && apt-get install -y --no-install-recommends \
4
- g++ \
5
- make \
6
- file \
7
- curl \
3
+ RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y \
4
+ build-essential \
5
+ bzip2 \
8
6
ca-certificates \
9
- python2.7-dev \
10
- git \
11
7
cmake \
8
+ curl \
9
+ file \
10
+ g++ \
11
+ gdb \
12
+ git \
13
+ libedit-dev \
14
+ make \
12
15
ninja-build \
16
+ nodejs \
17
+ python2.7-dev \
13
18
sudo \
14
- bzip2 \
15
19
xz-utils \
16
20
unzip
17
21
@@ -34,4 +38,4 @@ ENV TARGETS=x86_64-unknown-fuchsia
34
38
ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia
35
39
36
40
ENV RUST_CONFIGURE_ARGS --target=$TARGETS --enable-extended
37
- ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
41
+ ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ git reset --hard FETCH_HEAD
27
27
28
28
# Download toolchain
29
29
./scripts/download-toolchain
30
- chmod +x prebuilt/downloads/clang+llvm-x86_64-linux/bin/ *
30
+ chmod -R a+rx prebuilt/downloads/clang+llvm-x86_64-linux
31
31
cp -a prebuilt/downloads/clang+llvm-x86_64-linux/. /usr/local
32
32
33
33
build () {
You can’t perform that action at this time.
0 commit comments