Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 28ce3e8

Browse files
authoredAug 1, 2016
Auto merge of #35163 - sanxiyn:rollup, r=sanxiyn
Rollup of 8 pull requests - Successful merges: #34802, #35033, #35085, #35114, #35134, #35140, #35141, #35157 - Failed merges:
2 parents 2c1612c + 5fb13cf commit 28ce3e8

File tree

121 files changed

+372
-474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+372
-474
lines changed
 

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ services:
77
# our configure script, so disable auto submodule management.
88
git:
99
submodules: false
10+
depth: 1
1011

1112
before_install:
1213
- docker build -t rust -f src/etc/Dockerfile src/etc

‎src/etc/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,5 @@ RUN apt-get update && apt-get -y install \
2323
libedit-dev zlib1g-dev \
2424
llvm-3.7-tools cmake
2525

26-
# When we compile compiler-rt we pass it the llvm-config we just installed on
27-
# the system, but unfortunately it doesn't infer correctly where
28-
# LLVMConfig.cmake is so we need to coerce it a bit...
29-
RUN mkdir -p /usr/lib/llvm-3.7/build/share/llvm
30-
RUN ln -s /usr/share/llvm-3.7/cmake /usr/lib/llvm-3.7/build/share/llvm/cmake
31-
3226
RUN mkdir /build
3327
WORKDIR /build

0 commit comments

Comments
 (0)
Please sign in to comment.