Skip to content

Commit 36069b1

Browse files
author
James Miller
committed
---
yaml --- r: 56083 b: refs/heads/auto c: 35c73c8 h: refs/heads/master i: 56081: cb38ca1 56079: 47c071f v: v3
1 parent 8bdbf94 commit 36069b1

File tree

136 files changed

+1959
-4351
lines changed

Some content is hidden

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

136 files changed

+1959
-4351
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: 9db15f321598b5c3f246b284ab1c1daffae9e145
17+
refs/heads/auto: 35c73c80887cca62f8bba2eb9b9e277a98c37f93
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/configure

Lines changed: 3 additions & 3 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-
need_cmd file
240+
241241

242242
msg "inspecting environment"
243243

@@ -533,7 +533,7 @@ then
533533
LLVM_VERSION=$($LLVM_CONFIG --version)
534534

535535
case $LLVM_VERSION in
536-
(3.3|3.3svn|3.2|3.2svn)
536+
(3.2svn|3.2|3.1svn|3.1|3.0svn|3.0)
537537
msg "found ok version of LLVM: $LLVM_VERSION"
538538
;;
539539
(*)
@@ -859,7 +859,7 @@ do
859859
LDFLAGS=$LLVM_LDFLAGS
860860

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

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

0 commit comments

Comments
 (0)