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

Fix CFG_RUSTC variable in configure

Browse source
This commit is contained in:
Patrick Walton 2012-10-24 22:18:27 -07:00
parent 9fdab777c6
commit 0eea6621a8
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configure vendored
View file

@ -267,7 +267,7 @@ probe_need CFG_AUTOCONF213 autoconf213 \
autoconf2.13 \ autoconf2.13 \
autoconf-2.13 autoconf-2.13
if [ ! -z "$CFG_ENABLE_LOCAL_RUST" ] if [ ! -z "$CFG_LOCAL_RUST_ROOT" ]
then then
if [ ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc ] if [ ! -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc ]
then then
@ -275,7 +275,7 @@ then
else else
LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc --version` LRV=`${CFG_LOCAL_RUST_ROOT}/bin/rustc --version`
step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: " $LRV step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: " $LRV
CFG_RUSTC = ${CFG_LOCAL_RUST_ROOT}/bin/rustc CFG_RUSTC=${CFG_LOCAL_RUST_ROOT}/bin/rustc
fi fi
else else
probe_need CFG_RUSTC rustc probe_need CFG_RUSTC rustc
@ -392,6 +392,7 @@ putvar CFG_CONFIGURE_ARGS
putvar CFG_C_COMPILER putvar CFG_C_COMPILER
putvar CFG_SUBMODULES putvar CFG_SUBMODULES
putvar CFG_DISABLE_MANAGE_SUBMODULES putvar CFG_DISABLE_MANAGE_SUBMODULES
putvar CFG_RUSTC
msg msg
copy_if_changed ${CFG_SRC_DIR}Makefile.in ${CFG_BUILD_DIR}Makefile copy_if_changed ${CFG_SRC_DIR}Makefile.in ${CFG_BUILD_DIR}Makefile

2
src/servo/layout/box_builder.rs
View file

@ -75,7 +75,7 @@ priv fn simulate_UA_display_rules(node: Node) -> CSSDisplay {
} }
impl BoxGenerator { impl BoxGenerator {
static pub pure fn new(flow: @FlowContext) -> BoxGenerator { static pure fn new(flow: @FlowContext) -> BoxGenerator {
unsafe { debug!("Creating box generator for flow: %s", flow.debug_str()); } unsafe { debug!("Creating box generator for flow: %s", flow.debug_str()); }
BoxGenerator { BoxGenerator {
flow: flow, flow: flow,

2
src/servo/text/font.rs
View file

@ -63,7 +63,7 @@ struct RunMetrics {
impl Font { impl Font {
// TODO: who should own fontbuf? // TODO: who should own fontbuf?
static pub fn new(lib: @FontCache, fontbuf: @~[u8], native_font: NativeFont) -> Font { static fn new(lib: @FontCache, fontbuf: @~[u8], native_font: NativeFont) -> Font {
let metrics = native_font.get_metrics(); let metrics = native_font.get_metrics();
Font { Font {

2
src/servo/text/text_run.rs
View file

@ -40,7 +40,7 @@ impl SendableTextRun {
} }
impl TextRun { impl TextRun {
static pub fn new(font: @Font, text: ~str) -> TextRun { static fn new(font: @Font, text: ~str) -> TextRun {
let glyph_store = GlyphStore(text.len()); let glyph_store = GlyphStore(text.len());
let run = TextRun { let run = TextRun {
text: move text, text: move text,