Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'brson/wip'

Browse source 
Conflicts:
	src/rust
This commit is contained in:
Jack Moffitt 2013-04-30 23:49:42 -06:00
commit 25a10b4f0a
12 changed files with 11 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

26
configure vendored
View file

@ -323,31 +323,6 @@ else
CFG_RUSTC="${CFG_BUILD_DIR}src/rust/${DEFAULT_HOST_TRIPLE}/stage2/bin/rustc" CFG_RUSTC="${CFG_BUILD_DIR}src/rust/${DEFAULT_HOST_TRIPLE}/stage2/bin/rustc"
fi fi
if [ ! -z "$CFG_ENABLE_CLANG" ]
then
if [ -z "$CFG_CLANG" ]
then
err "clang requested but not found"
fi
CFG_CLANG_VERSION=$("$CFG_CLANG" \
--version \
| grep version \
| sed 's/.*\(version .*\)/\1/' \
| cut -d ' ' -f 2)
case $CFG_CLANG_VERSION in
(3.0svn | 3.0 | 3.1 | 4.0)
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
CFG_C_COMPILER="clang"
;;
(*)
err "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn"
;;
esac
else
CFG_C_COMPILER="gcc"
fi
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
then then
err "either clang or gcc is required" err "either clang or gcc is required"
@ -520,7 +495,6 @@ putvar CFG_OSTYPE
putvar CFG_SRC_DIR putvar CFG_SRC_DIR
putvar CFG_BUILD_DIR putvar CFG_BUILD_DIR
putvar CFG_CONFIGURE_ARGS putvar CFG_CONFIGURE_ARGS
putvar CFG_C_COMPILER
putvar CFG_SUBMODULES putvar CFG_SUBMODULES
putvar CFG_DISABLE_MANAGE_SUBMODULES putvar CFG_DISABLE_MANAGE_SUBMODULES
putvar CFG_RUSTC putvar CFG_RUSTC

2
src/mozjs

@ -1 +1 @@
Subproject commit 50f2e99633bf28f24b284821dbb723b38f2756e0 Subproject commit 19a4939e13f2387cb7831623480d91301092c202

2
src/rust-azure

@ -1 +1 @@
Subproject commit ce67fb0a051293effb53122cd078a66c8fbe2828 Subproject commit 985549a76eeeb5d10aae40812154424629534811

2
src/rust-core-foundation

@ -1 +1 @@
Subproject commit 4d0a8c1ca4d1f8b7036e3154a49f4066a3284697 Subproject commit a8ebe76090dd67f24a9da41404878f5316afbf6a

2
src/rust-css

@ -1 +1 @@
Subproject commit 55fc4d7f9b171d8e5e681ff3656b34785b79d2af Subproject commit df1490e1ad4f7af5f8fe42261816c94a5fa2a4b4

2
src/rust-fontconfig

@ -1 +1 @@
Subproject commit 7cb7a7aace99b17f99f15649377bb13a0dac9b63 Subproject commit 88b5ecfee0669b283b489d46df51e3fcbf6c6727

2
src/rust-geom

@ -1 +1 @@
Subproject commit 01d031b0c1ca824382de5dcdd6d98799136346af Subproject commit 25da45eb51c8444e1aa2245c22daa8d1903a04a0

2
src/rust-harfbuzz

@ -1 +1 @@
Subproject commit 513357cae8422a83bc202a28e77ddc43187b3de1 Subproject commit bbd2f39cde4ab08b55f641390be154b59678aecf

2
src/rust-opengles

@ -1 +1 @@
Subproject commit fd81a10887caf6bc3efb0b53efdffa4bfca4c078 Subproject commit 82c8acc14e1024706dfde215e5fe3e48a184ad5e

2
src/rust-wapcaplet

@ -1 +1 @@
Subproject commit 22e65e5fd44508f6565f914a844fa314c3545608 Subproject commit 1afc08b508d4980342a715a5d3faef63ac4389c3

2
src/sharegl

@ -1 +1 @@
Subproject commit b9434228ce8cf24fe9686e392c9661fc049b5b64 Subproject commit 13204263ab4efd00bcd699c8e120c9e6a52e785c

2
src/skia

@ -1 +1 @@
Subproject commit c58b7def2e00d2fc6ab224db00439d39648db7c9 Subproject commit 4af440519885bc45ed51349e9b501b1550f75d9c