Skip to content

Commit 2f6b249

Browse files
---
yaml --- r: 196014 b: refs/heads/beta c: e05c2f8 h: refs/heads/master v: v3
1 parent 91d2ecd commit 2f6b249

File tree

3,433 files changed

+42908
-57905
lines changed

Some content is hidden

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

3,433 files changed

+42908
-57905
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3030
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3131
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32-
refs/heads/beta: d528aa9960cb9b937d8ef6c09905a6a8076d5f3a
32+
refs/heads/beta: e05c2f80da3bf538c045d0682426a25b1c4b862b
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3535
refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511

branches/beta/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ Peter Schuller <[email protected]>
606606
Peter Williams <[email protected]>
607607
Peter Zotov <[email protected]>
608608
Petter Remen <[email protected]>
609-
Phil Dawes <[email protected]>
609+
Phil Dawes <[email protected]>
610610
Phil Ruffwind <[email protected]>
611611
Philip Munksgaard <[email protected]>
612612
Philipp Brüschweiler <[email protected]>

branches/beta/Makefile.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@
9797
# make check-stage1-rpass TESTNAME=my-shiny-new-test
9898
#
9999
# // Having trouble figuring out which test is failing? Turn off parallel tests
100-
# make check-stage1-std RUST_TEST_THREADS=1
100+
# make check-stage1-std RUST_TEST_TASKS=1
101+
#
102+
# This is hardly all there is to know of The Rust Build System's
103+
# mysteries. The tale continues on the wiki[1].
104+
#
105+
# [1]: https://github.com/rust-lang/rust/wiki/Note-testsuite
101106
#
102107
# If you really feel like getting your hands dirty, then:
103108
#

branches/beta/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Read ["Installing Rust"] from [The Book].
6464
# Choose one based on platform:
6565
$ pacman -S mingw-w64-i686-toolchain
6666
$ pacman -S mingw-w64-x86_64-toolchain
67-
67+
6868
$ pacman -S base-devel
6969
```
7070
@@ -115,7 +115,7 @@ The Rust community congregates in a few places:
115115

116116
## Contributing
117117

118-
To contribute to Rust, please see [CONTRIBUTING](CONTRIBUTING.md).
118+
To contribute to Rust, please see [CONTRIBUTING.md](CONTRIBUTING.md).
119119

120120
Rust has an [IRC] culture and most real-time collaboration happens in a
121121
variety of channels on Mozilla's IRC network, irc.mozilla.org. The
@@ -131,4 +131,4 @@ Rust is primarily distributed under the terms of both the MIT license
131131
and the Apache License (Version 2.0), with portions covered by various
132132
BSD-like licenses.
133133
134-
See [LICENSE-APACHE](LICENSE-APACHE), [LICENSE-MIT](LICENSE-MIT), and [COPYRIGHT](COPYRIGHT) for details.
134+
See LICENSE-APACHE, LICENSE-MIT, and COPYRIGHT for details.

branches/beta/configure

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ case $CFG_OSTYPE in
404404
CFG_OSTYPE=pc-windows-gnu
405405
;;
406406

407-
# Thad's Cygwin identifiers below
407+
# Thad's Cygwin identifers below
408408

409409
# Vista 32 bit
410410
CYGWIN_NT-6.0)
@@ -430,10 +430,6 @@ case $CFG_OSTYPE in
430430
CFG_CPUTYPE=x86_64
431431
;;
432432

433-
# Win 8 # uname -s on 64-bit cygwin does not contain WOW64, so simply use uname -m to detect arch (works in my install)
434-
CYGWIN_NT-6.3)
435-
CFG_OSTYPE=pc-windows-gnu
436-
;;
437433
# We do not detect other OS such as XP/2003 using 64 bit using uname.
438434
# If we want to in the future, we will need to use Cygwin - Chuck's csih helper in /usr/lib/csih/winProductName.exe or alternative.
439435
*)
@@ -461,10 +457,7 @@ case $CFG_CPUTYPE in
461457
CFG_CPUTYPE=aarch64
462458
;;
463459

464-
# At some point, when ppc64[le] support happens, this will need to do
465-
# something clever. For now it's safe to assume that we're only ever
466-
# interested in building 32 bit.
467-
powerpc | ppc | ppc64)
460+
powerpc)
468461
CFG_CPUTYPE=powerpc
469462
;;
470463

@@ -479,19 +472,10 @@ esac
479472
# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
480473
if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
481474
then
482-
# $SHELL does not exist in standard 'sh', so probably only exists
483-
# if configure is running in an interactive bash shell. /usr/bin/env
484-
# exists *everywhere*.
485-
BIN_TO_PROBE="$SHELL"
486-
if [ -z "$BIN_TO_PROBE" -a -e "/usr/bin/env" ]; then
487-
BIN_TO_PROBE="/usr/bin/env"
475+
file -L "$SHELL" | grep -q "x86[_-]64"
476+
if [ $? != 0 ]; then
477+
CFG_CPUTYPE=i686
488478
fi
489-
if [ -n "$BIN_TO_PROBE" ]; then
490-
file -L "$BIN_TO_PROBE" | grep -q "x86[_-]64"
491-
if [ $? != 0 ]; then
492-
CFG_CPUTYPE=i686
493-
fi
494-
fi
495479
fi
496480

497481

@@ -526,8 +510,7 @@ VAL_OPTIONS=""
526510
opt valgrind 0 "run tests with valgrind (memcheck by default)"
527511
opt helgrind 0 "run tests with helgrind instead of memcheck"
528512
opt valgrind-rpass 1 "run rpass-valgrind tests with valgrind"
529-
opt docs 1 "build standard library documentation"
530-
opt compiler-docs 0 "build compiler documentation"
513+
opt docs 1 "build documentation"
531514
opt optimize 1 "build optimized rust code"
532515
opt optimize-cxx 1 "build optimized C++ code"
533516
opt optimize-llvm 1 "build optimized LLVM"
@@ -714,17 +697,15 @@ probe CFG_ADB adb
714697

715698
if [ ! -z "$CFG_PANDOC" ]
716699
then
717-
# Extract "MAJOR MINOR" from Pandoc's version number
718-
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
719-
sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/')
700+
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc\(.exe\)\? ' |
701+
# extract the first 2 version fields, ignore everything else
702+
sed 's/pandoc\(.exe\)\? \([0-9]*\)\.\([0-9]*\).*/\2 \3/')
720703

721704
MIN_PV_MAJOR="1"
722705
MIN_PV_MINOR="9"
723-
724706
# these patterns are shell globs, *not* regexps
725707
PV_MAJOR=${PV_MAJOR_MINOR% *}
726708
PV_MINOR=${PV_MAJOR_MINOR#* }
727-
728709
if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
729710
then
730711
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
@@ -773,9 +754,8 @@ fi
773754
# Force bitrig to build with clang; gcc doesn't like us there
774755
if [ $CFG_OSTYPE = unknown-bitrig ]
775756
then
776-
step_msg "on Bitrig, forcing use of clang, disabling jemalloc"
757+
step_msg "on Bitrig, forcing use of clang"
777758
CFG_ENABLE_CLANG=1
778-
CFG_ENABLE_JEMALLOC=0
779759
fi
780760

781761
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
@@ -836,11 +816,11 @@ then
836816
LLVM_VERSION=$($LLVM_CONFIG --version)
837817

838818
case $LLVM_VERSION in
839-
(3.[5-6]*)
819+
(3.[2-6]*)
840820
msg "found ok version of LLVM: $LLVM_VERSION"
841821
;;
842822
(*)
843-
err "bad LLVM version: $LLVM_VERSION, need >=3.5"
823+
err "bad LLVM version: $LLVM_VERSION, need >=3.0svn"
844824
;;
845825
esac
846826
fi

0 commit comments

Comments
 (0)