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

Update the configuration files to properly build rust. Revert rust-stb-image submodule misupdate.

Browse source
This commit is contained in:
Lars Bergstrom 2014-04-08 18:58:29 -05:00
parent aa636218e1
commit 00e5f010d4
9 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile.in
View file

@ -107,6 +107,12 @@ $(B)src/compiler/rust/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-tr
rust: $(CFG_RUSTC)
# These arguments are automatically provided by the Rust compiler's build process to
# itself, so they must be specified later for our Rust modules.
ifeq ($(CFG_OSTYPE),linux-androideabi)
CFG_RUSTC_FLAGS += --target arm-linux-androideabi -C android-cross-path=$(CFG_ANDROID_CROSS_PATH)
endif
# Strip off submodule paths to determine "raw" submodule names.
SUBMODULES=$(shell echo $(CFG_SUBMODULES) | perl -p -e 's![A-Za-z0-9_-]+/!!g')

1
configure vendored
View file

@ -385,7 +385,6 @@ case ${TARGET_OSTYPE} in
probe CFG_RANLIB arm-linux-androideabi-ranlib
export PATH=${OLD_PATH}
CFG_RUSTC_FLAGS="--target=${CFG_TARGET_TRIPLES} -C android-cross-path=${CFG_ANDROID_CROSS_PATH}"
;;
*)
CFG_PATH=$PATH

2
src/compiler/rust

@ -1 +1 @@
Subproject commit d6811bc1bdeb66381af4b9bf3e4ff77b3cee27f6
Subproject commit aa39d755e3f9823b51cc57761c0c8c75759aca2e

6
src/components/main/layout/context.rs
View file

@ -37,7 +37,7 @@ use std::local_data;
static mut FONT_CONTEXT: *mut FontContext = 0 as *mut FontContext;
#[cfg(target_os="android")]
local_data_key!(font_context: * mut FontContext)
local_data_key!(font_context: *mut FontContext)
#[cfg(not(target_os="android"))]
#[thread_local]
@ -45,7 +45,7 @@ static mut APPLICABLE_DECLARATIONS_CACHE: *mut ApplicableDeclarationsCache =
0 as *mut ApplicableDeclarationsCache;
#[cfg(target_os="android")]
local_data_key!(applicable_declarations_cache: * mut ApplicableDeclarationsCache)
local_data_key!(applicable_declarations_cache: *mut ApplicableDeclarationsCache)
#[cfg(not(target_os="android"))]
#[thread_local]
@ -53,7 +53,7 @@ static mut STYLE_SHARING_CANDIDATE_CACHE: *mut StyleSharingCandidateCache =
0 as *mut StyleSharingCandidateCache;
#[cfg(target_os="android")]
local_data_key!(style_sharing_candidate_cache: * mut StyleSharingCandidateCache)
local_data_key!(style_sharing_candidate_cache: *mut StyleSharingCandidateCache)
/// Data shared by all layout workers.
#[deriving(Clone)]

4
src/components/main/servo.rs
View file

@ -67,8 +67,8 @@ use servo_util::opts;
#[cfg(not(test))]
use servo_util::url::parse_url;
#[cfg(not(test), target_os="linux")]
#[cfg(not(test), target_os="macos")]
#[cfg(not(test), not(target_os="android"))]
use std::os;
#[cfg(not(test), target_os="android")]
use std::str;

2
src/platform/android/servo-android-glue

@ -1 +1 @@
Subproject commit 89757a91ba1b012cb003ceb60a121226f5646c02
Subproject commit 0941b7702380d57ffe95823cfb057d752fd150ae

2
src/support/egl/rust-egl

@ -1 +1 @@
Subproject commit c2b23d8aa8dc857536b1b68cf6646a1e11517161
Subproject commit ffb1be4fecbfadacd02e5a714025bc58e6833f27

2
src/support/layers/rust-layers

@ -1 +1 @@
Subproject commit 42f6584fff271939f9eb7af031710ff4b65df464
Subproject commit 10d40153462cf7248fcf35db5c18cf026cd25aea

2
src/support/stb-image/rust-stb-image

@ -1 +1 @@
Subproject commit a2671a7aec350a85f5de5b4838cbc500ecb03720
Subproject commit 064e33d8217424a33636c8019b1f1f74a44ee2bb