Skip to content

Fix cross-compilation. #102

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.

Sign up for GitHub

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

Merged
bors-servo merged 2 commits into from
Jul 30, 2015
Merged

Fix cross-compilation. #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79f7743
Fix cross-compilation error in shared/build.rs
mbrubeck Jul 30, 2015
28c2db7
Fix cross-compilation.
SimonSapin Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "string_cache"
version = "0.1.9"
version = "0.1.10"
authors = [ "The Servo Project Developers" ]
description = "A string interning library for Rust, developed as part of the Servo project."
license = "MIT / Apache-2.0"
Expand Down
3 changes: 2 additions & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ extern crate string_cache_shared;

use string_cache_shared::{STATIC_ATOM_SET, ALL_NS, pack_static};

use std::env;
use std::ascii::AsciiExt;
use std::fs::File;
use std::io::{BufWriter, Write};
use std::path::Path;

fn main() {
let path = Path::new(env!("OUT_DIR")).join("ns_atom_macros_without_plugin.rs");
let path = Path::new(&env::var("OUT_DIR").unwrap()).join("ns_atom_macros_without_plugin.rs");
let mut file = BufWriter::new(File::create(&path).unwrap());
writeln!(file, r"#[macro_export]").unwrap();
writeln!(file, r"macro_rules! ns {{").unwrap();
Expand Down
4 changes: 2 additions & 2 deletions shared/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "string_cache_shared"
version = "0.1.4"
version = "0.1.5"
authors = [ "The Servo Project Developers" ]
description = "A string interning library for Rust, developed as part of the Servo project − shared code between the compiler plugin and main crate."
license = "MIT / Apache-2.0"
Expand All @@ -14,7 +14,7 @@ name = "string_cache_shared"
path = "lib.rs"

[dependencies]
debug_unreachable = "0.0.5"
debug_unreachable = "0.0.6"
phf = "0.7.3"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion shared/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn main() {
set.entry(atom);
}

let path = Path::new(env!("OUT_DIR")).join("static_atom_set.rs");
let path = Path::new(&std::env::var("OUT_DIR").unwrap()).join("static_atom_set.rs");
let mut file = BufWriter::new(File::create(&path).unwrap());
write!(&mut file, "pub static STATIC_ATOM_SET: phf::OrderedSet<&'static str> = ").unwrap();
set.build(&mut file).unwrap();
Expand Down