Skip to content

Release note on #[macroescape] #5566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
d177876
rt: Inline get_sp_limit/set_sp_limit/get_sp for x86_64.
luqmana Mar 18, 2013
a692777
rt: Inline get_sp_limit/set_sp_limit/get_sp for x86.
luqmana Mar 18, 2013
e8ddef9
core: Cleanup rt::context
brson Mar 12, 2013
d30c758
Give core::rt and std::net their own uvll bindings
brson Mar 12, 2013
723d224
core: Don't use printf in rtdebug!
brson Mar 12, 2013
54bb722
core: Simplify uvll bindings and strip out currently-unused bits
brson Mar 13, 2013
42cba98
core: Convert some multiline statements to single-line
brson Mar 14, 2013
9a075f2
core: Rename rt::io to rt::rtio
brson Mar 14, 2013
5e6dacf
mk: If NO_REBUILD is set then don't rebuild core/std before testing
brson Mar 14, 2013
57e85b5
core: Add rt::io and start sketching the API
brson Mar 14, 2013
7ef54c7
core: Begin uv file system bindings
brson Mar 15, 2013
a882554
core: Refactor uv bindings
brson Mar 16, 2013
0447034
Add a way to run the test suite with the new scheduler
brson Mar 16, 2013
5af5766
core: Initialize global state lazily in the Scheduler ctor
brson Mar 16, 2013
e821671
Refactor trans_call to separate out the translation of the arguments,…
nikomatsakis Mar 19, 2013
18a594f
syntax: move ext/deriving.rs to ext/deriving/mod.rs
apasel422 Mar 19, 2013
3042321
syntax: split deriving module into submodules for each trait
apasel422 Mar 19, 2013
fe74a1c
core: rename vec::rev_each{,i} to vec::each{,i}_reverse
erickt Mar 13, 2013
63a292f
auto merge of #5434 : apasel422/rust/deriving, r=nikomatsakis
bors Mar 20, 2013
4b0f29a
core: add char_at_reverse
erickt Mar 15, 2013
8d5ab30
core: add char_len method
erickt Mar 15, 2013
cefecd8
core: add str::each{,i}_reverse
erickt Mar 13, 2013
e72d011
librustc: Remove debug code and add scary warnings for rusti/rustpkg
pcwalton Mar 20, 2013
0847d52
auto merge of #5450 : pcwalton/rust/warnings, r=graydon
bors Mar 20, 2013
99ac243
auto merge of #5445 : nikomatsakis/rust/issue-3678-refactor-trans_cal…
bors Mar 20, 2013
ab8e46b
add assert_eq! macro
jbclements Mar 13, 2013
373504a
testsuite: Add test for #4210
catamorphism Mar 20, 2013
bb9e1e2
core: add Reader, Writer, ReaderUtil, WriterUtil to prelude. Close #4…
graydon Mar 20, 2013
9350d14
add stage3 markers where necessary for dist-snap
graydon Mar 20, 2013
9c4d804
libsyntax: Never use `::<>` in the type grammar
pcwalton Mar 20, 2013
a29934a
librustc: Fix bug preventing `-framework Foo` from working cross-crate.
pcwalton Mar 20, 2013
51da7d4
auto merge of #5453 : catamorphism/rust/issue-4120, r=catamorphism
bors Mar 20, 2013
257ef26
etc: Suppress Linux valgrind issues for new scheduler
pcwalton Mar 20, 2013
6f3d168
auto merge of #5447 : erickt/rust/incoming, r=graydon
bors Mar 20, 2013
3cd65c2
change some uses of fail_unless to assert_eq
jbclements Mar 13, 2013
b12714e
auto merge of #5455 : pcwalton/rust/framework, r=catamorphism
bors Mar 20, 2013
a7d296f
renamed str::view -> slice_DBG_BRWD
Kimundi Mar 20, 2013
a8527e2
auto merge of #5456 : graydon/rust/fixups, r=pcwalton
bors Mar 21, 2013
db00362
Make typechecker compositional
catamorphism Mar 20, 2013
9814d0d
auto merge of #5458 : pcwalton/rust/valgrind-suppress, r=pcwalton
bors Mar 21, 2013
280b8a2
rt: Increase C_STACK_SIZE to 2MB to get JIT/rusti working again (dlop…
z0w0 Mar 21, 2013
e84323e
Switch Module.children from oldmap
sanxiyn Mar 21, 2013
2ed80c3
librustc: Fix path-qualified and cross-crate constants in match patte…
luqmana Mar 21, 2013
3f2d576
Test for cross-crate const in match pattern.
luqmana Mar 21, 2013
f68f228
Switch Module.import_resolutions from oldmap
sanxiyn Mar 21, 2013
3ac8973
auto merge of #5465 : sanxiyn/rust/remove-oldmap, r=sanxiyn
bors Mar 21, 2013
64d923f
Move the function to time passes to util
sanxiyn Mar 21, 2013
dad5c30
Time type checking passes separately
sanxiyn Mar 21, 2013
1fa2b99
test: XFAIL test issue-4120 due to Valgrind complaints.
pcwalton Mar 21, 2013
8f44488
removed str::slice_DBG_UNIQ
Kimundi Mar 21, 2013
f0beb8c
Switch CoherenceInfo from oldmap
sanxiyn Mar 21, 2013
9d9a209
back-renamed slice_DBG_BRWD, slice_V_DBG_BRWD -> slice, slice_DBG_UNI…
Kimundi Mar 21, 2013
e2b9cdd
Switch impls_seen from oldmap
sanxiyn Mar 21, 2013
0b4f268
auto merge of #5470 : sanxiyn/rust/remove-oldmap-2, r=sanxiyn
bors Mar 21, 2013
b889913
auto merge of #5466 : Kimundi/rust/view-slice-rename, r=bstrie
bors Mar 21, 2013
efb5f87
libcore: Remove a few possibly-cyclic imports in an effort to unbreak…
pcwalton Mar 21, 2013
56d288d
auto merge of #5464 : luqmana/rust/const-pat, r=pcwalton
bors Mar 21, 2013
5726fd4
librustc: Forbid access to cross-crate private static methods
pcwalton Mar 20, 2013
87d9316
auto merge of #5457 : pcwalton/rust/xcpsm, r=pcwalton
bors Mar 21, 2013
f36f9fc
rustc: Comments only - explain the invariant about ty_err and ty_bot …
catamorphism Mar 21, 2013
6aa612a
auto merge of #5461 : catamorphism/rust/flagless, r=nikomatsakis
bors Mar 21, 2013
ed25a67
auto merge of #5468 : z0w0/rust/iluvdatjit, r=pcwalton
bors Mar 21, 2013
f9bb7b7
Tutorial: make struct section more coherent
lucab Mar 19, 2013
5d40630
trie: make impl pub
thestinger Mar 21, 2013
5acfe3d
replace the core-map benchmark
thestinger Mar 21, 2013
ee2f3d9
Switched over substr and trim functions in str to be non-allocating, …
Kimundi Mar 21, 2013
0a47cd5
Un-renamed trim and substr functions.
Kimundi Mar 21, 2013
ec8345b
auto merge of #5407 : jbclements/rust/add-assert-eq-macro, r=jbclements
bors Mar 21, 2013
b206017
deque: add a module docstring
thestinger Mar 21, 2013
80d47fd
auto merge of #5476 : thestinger/rust/bench, r=graydon
bors Mar 22, 2013
d4fee24
librustc: Forbid destructors from being attached to any structs that …
pcwalton Mar 21, 2013
02c49b3
libsyntax: Remove `@const` from the language
pcwalton Mar 21, 2013
94327d0
librustc: Replace the `&static` bound with `'static`
pcwalton Mar 22, 2013
2cbfe6d
stop installing empty .so files
thestinger Mar 21, 2013
d8c0da3
auto merge of #5441 : lucab/rust/lucab/tutorial/struct, r=z0w0
bors Mar 22, 2013
e7dbe6c
librustc: Register new snapshots
pcwalton Mar 22, 2013
5f2d410
auto merge of #5479 : Kimundi/rust/str-dealloc, r=z0w0
bors Mar 22, 2013
d52408d
auto merge of #5480 : pcwalton/rust/at-const, r=pcwalton
bors Mar 22, 2013
557b8cc
core: fix a typo in levdistance
erickt Mar 22, 2013
334e921
auto merge of #5481 : thestinger/rust/deque, r=z0w0
bors Mar 22, 2013
27434e8
auto merge of #5482 : thestinger/rust/install, r=pcwalton
bors Mar 22, 2013
9584c60
auto merge of #5484 : pcwalton/rust/snapshots, r=pcwalton
bors Mar 22, 2013
98e8fe1
core: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
4055fe8
std: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
baf6a63
rustdoc: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
72d7d60
fuzzer: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
9966eaa
rustc: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
ec96096
test: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
6e883c7
compiletest: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
e2abecd
syntax: replace uses of old deriving attribute with new one
apasel422 Mar 20, 2013
999e7ef
syntax: make old `#[deriving_foo]` attribute obsolete
apasel422 Mar 20, 2013
0597647
auto merge of #5493 : apasel422/rust/leibniz, r=bstrie
bors Mar 22, 2013
429b8a9
libcore: handle trailing newlines more like other languages.
huonw Mar 14, 2013
f832339
compiletest: Use lines_each instead of lines(..).each, or split(.., n…
huonw Mar 19, 2013
d700500
auto merge of #5471 : erickt/rust/incoming, r=bstrie
bors Mar 22, 2013
1a0d212
Build up the result of fmt! in a buffer instead of a vector
alexcrichton Mar 20, 2013
c0bbc62
Removing some unused imports
alexcrichton Mar 21, 2013
e93654c
Pass the fmt! buffer to each conversion method
alexcrichton Mar 21, 2013
1616ffd
auto merge of #5398 : dbaupp/rust/core-readlines, r=graydon
bors Mar 22, 2013
f011f92
auto merge of #5463 : alexcrichton/rust/faster-fmt, r=graydon
bors Mar 22, 2013
4634f7e
librustc: Remove all uses of `static` from functions. rs=destatic
pcwalton Mar 22, 2013
be9bddd
libcore: Remove `pure` from libcore. rs=depure
pcwalton Mar 22, 2013
c108409
libstd: Remove all uses of `pure` from libstd. rs=depure
pcwalton Mar 22, 2013
b6f9aa1
auto merge of #5483 : pcwalton/rust/static-syntax, r=graydon
bors Mar 22, 2013
d049bf2
Edit release notes a bit
catamorphism Mar 22, 2013
19c1040
configure: accept clang 3.3 when passed --enable-clang
luqmana Mar 22, 2013
ec59ce5
test: Fix test. rs=test
pcwalton Mar 22, 2013
e7c60c1
librustc: Remove `pure` from libsyntax and librustc.
pcwalton Mar 22, 2013
fbe22af
librustdoc: Remove `pure` from fuzzer and rustdoc.
pcwalton Mar 22, 2013
3eda11a
test: Remove `pure` from the test suite
pcwalton Mar 22, 2013
e9b077c
auto merge of #5488 : pcwalton/rust/depure, r=pcwalton
bors Mar 22, 2013
bd065d3
auto merge of #5496 : catamorphism/rust/release-notes, r=catamorphism
bors Mar 22, 2013
ab2a397
docs: Copyedit my randomly assigned sections of the manual
catamorphism Mar 22, 2013
04e367b
trie: rm workaround for issue #3469
thestinger Mar 22, 2013
55fbb95
trie: inline the other TrieSet wrapper methods
thestinger Mar 22, 2013
0c8c3b4
trie: make the TrieSet impl public
thestinger Mar 22, 2013
705c796
remove obsolete purity workarounds
thestinger Mar 22, 2013
5b43810
auto merge of #5497 : luqmana/rust/clang-ver, r=thestinger
bors Mar 22, 2013
3633ba2
Copyedit macro tutorial
catamorphism Mar 22, 2013
1e41bc7
auto merge of #5501 : catamorphism/rust/manual, r=graydon
bors Mar 22, 2013
d60a725
auto merge of #5503 : thestinger/rust/trie, r=pcwalton
bors Mar 23, 2013
9aa0ced
changed /configure to be compatible with Cygwin and removed annoying …
thadguidry Mar 23, 2013
fa70709
libsyntax: Stop parsing `pure` and `static`
pcwalton Mar 22, 2013
eba3367
libsyntax: Introduce the new `assert!` macro; make `assert` no longer…
pcwalton Mar 22, 2013
85c9fc6
librustc: Remove the `const` declaration form everywhere
pcwalton Mar 22, 2013
68cb536
libsyntax: Stop parsing `const`.
pcwalton Mar 22, 2013
6d81307
librustc: Add explicit lifetime binders and new lifetime notation in …
pcwalton Mar 22, 2013
66770d2
test: Add lifetime binders and new-style lifetime parameters to the t…
pcwalton Mar 22, 2013
e2fde83
libsyntax: Stop parsing old lifetime syntax
pcwalton Mar 22, 2013
28efc23
libcore: Fix obsolete syntax in extfmt
pcwalton Mar 23, 2013
11ca2ef
turn std::oldmap into a wrapper around LinearMap
thestinger Mar 23, 2013
2b83def
core: derive Clone for core types
apasel422 Mar 22, 2013
45677ee
replace impls with `deriving` where applicable
apasel422 Mar 22, 2013
a1b4afe
Update coherence rules to be more flexible for `impl Trait for Type`
nikomatsakis Mar 21, 2013
8aee0a6
libsyntax: Fix `static` in pretty printer. rs=burningtree
pcwalton Mar 23, 2013
a56ec8c
auto merge of #5515 : nikomatsakis/rust/issue-5514-flexible-coherence…
bors Mar 23, 2013
6f42738
auto merge of #5510 : thadguidry/rust/incoming, r=brson
bors Mar 23, 2013
a919e5e
make crates with the same name sort consistently
thestinger Mar 24, 2013
441313f
librustc: emit loop for expr_repeat instead of 2n instructions in [x,…
luqmana Mar 24, 2013
12df654
Kill some warnings: unused imports and old #[deny(..)]s.
huonw Mar 24, 2013
29e8b6e
libcore: implement `str::each_char_reverse` correctly.
huonw Mar 24, 2013
7948149
treemap: add a find_mut method
thestinger Mar 24, 2013
89a7407
librustc: clean-up expr_repeat loop generation: use native integers
huonw Mar 24, 2013
d774333
hashmap: add find_mut method
thestinger Mar 24, 2013
89e2578
trie: add find_mut method
thestinger Mar 25, 2013
f0f4a00
smallintmap: add find_mut method
thestinger Mar 25, 2013
38f39ac
expose find_mut in the Map trait
thestinger Mar 25, 2013
e8bf0a4
trie: improve docstring
thestinger Mar 25, 2013
585c572
rustdoc: Show purity
sanxiyn Mar 25, 2013
2911fc2
configure: error on unsupported target-triples and arm-linux-androide…
yichoi Mar 25, 2013
8604165
kate: remove `const`, `log`, and `pure` keywords, add `super` keyword
apasel422 Mar 25, 2013
218093d
configure: simplify pandoc version recognition.
huonw Mar 25, 2013
6647150
core: Fix doc comment error, as per #4983
catamorphism Mar 25, 2013
6d4499c
auto merge of #5424 : luqmana/rust/inline-rt, r=brson
bors Mar 25, 2013
30d4124
Merge remote-tracking branch 'brson/rt'
brson Mar 24, 2013
ef282db
auto merge of #5409 : brson/rust/rt, r=brson
bors Mar 25, 2013
057c40d
make ty_region give a useful span when it fails
nikomatsakis Mar 25, 2013
df171e4
auto merge of #5505 : catamorphism/rust/macro-tutorial, r=graydon
bors Mar 25, 2013
e7f42f1
Expand on cleanups in trans for expr_repeat and add to tests.
luqmana Mar 25, 2013
62c1f04
RELEASES.txt: Mention asm!, add cset count and a hyphen.
graydon Mar 22, 2013
b481829
docs: update to avoid mention of const.
graydon Mar 22, 2013
5f7b72e
RELEASES.txt: wrong tick-mark
graydon Mar 22, 2013
d469212
auto merge of #5507 : graydon/rust/fixups2, r=graydon
bors Mar 25, 2013
b48e699
auto merge of #5509 : thestinger/rust/oldmap, r=brson
bors Mar 26, 2013
00605d5
auto merge of #5513 : apasel422/rust/deriving, r=luqmana
bors Mar 26, 2013
02d5f09
auto merge of #5524 : luqmana/rust/repeat-loop, r=pcwalton
bors Mar 26, 2013
47ddb59
auto merge of #5525 : dbaupp/rust/minor_fixups, r=graydon
bors Mar 26, 2013
7481524
auto merge of #5528 : thestinger/rust/find_mut, r=brson
bors Mar 26, 2013
5591d34
auto merge of #5536 : sanxiyn/rust/doc-purity, r=brson
bors Mar 26, 2013
ff9c943
auto merge of #5537 : yichoi/rust/pull-0325, r=brson
bors Mar 26, 2013
dfedcc3
auto merge of #5539 : apasel422/rust/kate, r=brson
bors Mar 26, 2013
2815328
auto merge of #5540 : dbaupp/rust/configure-pandoc-version, r=brson
bors Mar 26, 2013
dcc8869
add deriving changes to release notes
apasel422 Mar 24, 2013
125cdf5
auto merge of #5542 : catamorphism/rust/issue-4983, r=catamorphism
bors Mar 26, 2013
51eb7dc
auto merge of #5538 : apasel422/rust/release-notes, r=sanxiyn
bors Mar 26, 2013
74fb263
auto merge of #5546 : nikomatsakis/rust/ty_region-useful-span, r=cata…
bors Mar 26, 2013
969e8b7
added note about #[macro_escape]
jbclements Mar 26, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\

CORELIB_CRATE := $(S)src/libcore/core.rc
CORELIB_INPUTS := $(wildcard $(addprefix $(S)src/libcore/, \
core.rc *.rs */*.rs))
core.rc *.rs */*.rs */*/*rs))

######################################################################
# Standard library variables
Expand Down
29 changes: 19 additions & 10 deletions RELEASES.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
Version 0.6 (March 2013)
---------------------------

* ~??? changes, numerous bugfixes
* ~2000 changes, numerous bugfixes

* TODO:
* Ord/Cmp
* Lifetime changes
* Implicit self
* Remove `static` keyword
* Static method syntax
* `as Trait`
* `copy` removed, replaced with `Clone`?
* `std::map` removed, replaced with `core::hashmap`
* More details for "Name resolution continues to be tweaked"?

* Syntax changes
* The self type parameter in traits is now spelled `Self`
* The `self` parameter in trait and impl methods must now be explicitly
named (for example: `fn f(&self) { }`). Implicit self is deprecated.
* Replaced the `Durable` trait with the `'static` lifetime
* The old closure type syntax with the trailing sigil has been
removed in favor of the more consistent leading sigil
Expand All @@ -23,7 +24,7 @@ Version 0.6 (March 2013)
* Traits are implemented with `impl Trait for Type`
instead of `impl Type: Trait`
* The `export` keyword has finally been removed
* The `move` keyword has been removed (linear types move by default)
* The `move` keyword has been removed (see "Semantic changes")
* The interior mutability qualifier on vectors, `[mut T]`, has been
removed. Use `&mut [T]`, etc.
* `mut` is no longer valid in `~mut T`. Use inherited mutability
Expand All @@ -37,6 +38,12 @@ Version 0.6 (March 2013)
function modules. Use extern blocks: `extern { ... }`
* Newtype enums removed. Used tuple-structs.
* Trait implementations no longer support visibility modifiers
* Pattern matching over vectors improved and expanded
* `const` renamed to `static` to correspond to lifetime name,
and make room for future `static mut` unsafe mutable globals.
* Replaced `#[deriving_eq]` with `#[deriving(Eq)]`
* `Clone` implementations can be automatically generated with
`#[deriving(Clone)]`

* Semantic changes
* Types with owned pointers or custom destructors move by default,
Expand All @@ -49,14 +56,14 @@ Version 0.6 (March 2013)
* The default type of an inferred closure is &fn instead of @fn
* Name resolution continues to be tweaked
* Method visibility is inherited from the implementation declaration

* Other language changes
* Structural records have been removed
* Many more types can be used in constants, including enums
`static lifetime pointers and vectors
* Many more types can be used in static items, including enums
'static-lifetime pointers and vectors
* Pattern matching over vectors improved and expanded
* Typechecking of closure types has been overhauled to
improve inference and eliminate unsoundness
* Macros leave scope at the end of modules, unless that module is
tagged with #[macro_escape]

* Libraries
* Added big integers to `std::bigint`
Expand All @@ -68,6 +75,7 @@ Version 0.6 (March 2013)
* Containers reorganized around traits in `core::container`
* `core::dvec` removed, `~[T]` is a drop-in replacement
* `core::send_map` renamed to `core::hashmap`
* `std::map` removed; replaced with `core::hashmap`
* `std::treemap` reimplemented as an owned balanced tree
* `std::deque` and `std::smallintmap` reimplemented as owned containers
* `core::trie` added as a fast ordered map for integer keys
Expand All @@ -76,15 +84,16 @@ Version 0.6 (March 2013)
* Tools
* Replaced the 'cargo' package manager with 'rustpkg'
* Added all-purpose 'rust' tool
* `rustc --test` now supports a benchmarks with the `#[bench]` attribute
* `rustc --test` now supports benchmarks with the `#[bench]` attribute
* rustc now attempts to offer spelling suggestions

* Misc
* Improved support for ARM and Android
* Preliminary MIPS backend
* Improved foreign function ABI implementation for x86, x86_64
* Various and memory usage improvements
* Various memory usage improvements
* Rust code may be embedded in foreign code under limited circumstances
* Inline assembler supported by new asm!() syntax extension.

Version 0.5 (December 2012)
---------------------------
Expand Down
74 changes: 64 additions & 10 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,17 @@ validate_opt () {
isArgValid=1
fi
done
if test $isArgValid -eq 0
if [ "$arg" = "--help" ]
then
err "Option '$arg' is not recognized"
echo ""
echo "No more help available for Configure options,"
echo "check the Wiki or join our IRC channel"
break
else
if test $isArgValid -eq 0
then
err "Option '$arg' is not recognized"
fi
fi
done
}
Expand Down Expand Up @@ -266,13 +274,42 @@ case $CFG_OSTYPE in
MINGW32*)
CFG_OSTYPE=pc-mingw32
;;
# Thad's Cygwin identifers below

# Vista 32 bit
CYGWIN_NT-6.0)
CFG_OSTYPE=pc-mingw32
CFG_CPUTYPE=i686
;;

# Vista 64 bit
CYGWIN_NT-6.0-WOW64)
CFG_OSTYPE=w64-mingw32
CFG_CPUTYPE=x86_64
;;

# Win 7 32 bit
CYGWIN_NT-6.1)
CFG_OSTYPE=pc-mingw32
CFG_CPUTYPE=i686
;;

# Win 7 64 bit
CYGWIN_NT-6.1-WOW64)
CFG_OSTYPE=w64-mingw32
CFG_CPUTYPE=x86_64
;;

# We do not detect other OS such as XP/2003 using 64 bit using uname.
# 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.
*)
err "unknown OS type: $CFG_OSTYPE"
;;
esac


if [ -z "$CFG_CPUTYPE" ]
then
case $CFG_CPUTYPE in

i386 | i486 | i686 | i786 | x86)
Expand All @@ -290,6 +327,7 @@ case $CFG_CPUTYPE in
*)
err "unknown CPU type: $CFG_CPUTYPE"
esac
fi

# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
Expand Down Expand Up @@ -406,12 +444,13 @@ fi

if [ ! -z "$CFG_PANDOC" ]
then
PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
PANDOC_VER=${PANDOC_VER_LINE#pandoc }
PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
PV_MINOR=${PV_MINOR%%[.][0-9]*}
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
# extract the first 2 version fields, ignore everything else
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')

# these patterns are shell globs, *not* regexps
PV_MAJOR=${PV_MAJOR_MINOR% *}
PV_MINOR=${PV_MAJOR_MINOR#* }
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
then
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
Expand Down Expand Up @@ -519,7 +558,7 @@ then
| cut -d ' ' -f 2)

case $CFG_CLANG_VERSION in
(3.0svn | 3.0 | 3.1* | 3.2* | 4.0* | 4.1* | 4.2*)
(3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 4.0* | 4.1* | 4.2*)
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
CFG_C_COMPILER="clang"
;;
Expand All @@ -536,6 +575,7 @@ fi
CFG_PREFIX=${CFG_PREFIX%/}
CFG_HOST_TRIPLES="$(echo $CFG_HOST_TRIPLES | tr ',' ' ')"
CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
CFG_SUPPORTED_TARGET_TRIPLES="$(grep ^CC_*=* $CFG_SRC_DIR/mk/platform.mk | sed 's,^[^_]*_,,' | sed 's/\([^=]*\).*/\1/' | xargs)"

# copy host-triples to target-triples so that hosts are a subset of targets
V_TEMP=""
Expand All @@ -548,8 +588,22 @@ CFG_TARGET_TRIPLES=$V_TEMP
# check target-specific tool-chains
for i in $CFG_TARGET_TRIPLES
do
L_CHECK=false
for j in $CFG_SUPPORTED_TARGET_TRIPLES
do
if [ $i = $j ]
then
L_CHECK=true
fi
done

if [ $L_CHECK = false ]
then
err "unsupported target triples \"$i\" found"
fi

case $i in
arm-unknown-android)
arm-linux-androideabi)

if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-gcc ]
then
Expand Down
Loading