Skip to content

Commit 14076df

Browse files
committed
---
yaml --- r: 56166 b: refs/heads/auto c: 40e3577 h: refs/heads/master v: v3
1 parent c9b1268 commit 14076df

File tree

209 files changed

+10370
-8215
lines changed

Some content is hidden

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

209 files changed

+10370
-8215
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 1f94364aeff935eebadd3ae47dbae3eb099023da
17+
refs/heads/auto: 40e3577b0834794b2d44e6c527fda90d1adbc88e
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
.valgrindrc
5050
lexer.ml
5151
TAGS
52+
TAGS.emacs
53+
TAGS.vim
5254
version.ml
5355
version.texi
5456
/Makefile
@@ -60,6 +62,7 @@ config.mk
6062
/inst/
6163
/mingw-build/
6264
src/.DS_Store
65+
/tmp/
6366
/stage0/
6467
/dl/
6568
/stage1/
@@ -75,6 +78,8 @@ version.md
7578
rust.tex
7679
keywords.md
7780
x86_64-apple-darwin/
81+
x86_64-unknown-linux-gnu/
82+
i686-unknown-linux-gnu/
7883
doc/core/
7984
tmp.*.rs
8085
config.stamp

branches/auto/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ need_cmd uname
237237
need_cmd date
238238
need_cmd tr
239239
need_cmd sed
240-
240+
need_cmd file
241241

242242
msg "inspecting environment"
243243

@@ -859,7 +859,7 @@ do
859859
LDFLAGS=$LLVM_LDFLAGS
860860

861861
LLVM_FLAGS="$LLVM_TARGETS $LLVM_OPTS $LLVM_BUILD \
862-
$LLVM_HOST $LLVM_TARGET"
862+
$LLVM_HOST $LLVM_TARGET --with-python=$CFG_PYTHON"
863863

864864
msg "configuring LLVM with:"
865865
msg "$LLVM_FLAGS"

0 commit comments

Comments
 (0)