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

style: Remove MOZ_DIST

Browse source 
As mentioned in bug 1747354, the location of the dist directory is
relied to be $topobjdir/dist, so just use that consistently rather
than getting it from a separate variable for rust build scripts.

Differential Revision: https://phabricator.services.mozilla.com/D136556
This commit is contained in:
Mike Hommey 2023-06-06 23:44:05 +02:00 • committed by Oriol Brufau
parent 54878595b3
commit d32c5ed85f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/build_gecko.rs
View file

@ -58,11 +58,11 @@ lazy_static! {
}; };
static ref INCLUDE_RE: Regex = Regex::new(r#"#include\s*"(.+?)""#).unwrap(); static ref INCLUDE_RE: Regex = Regex::new(r#"#include\s*"(.+?)""#).unwrap();
static ref DISTDIR_PATH: PathBuf = { static ref DISTDIR_PATH: PathBuf = {
let path = PathBuf::from(env::var_os("MOZ_DIST").unwrap()); let path = PathBuf::from(env::var_os("MOZ_TOPOBJDIR").unwrap());
if !path.is_absolute() || !path.is_dir() { if !path.is_absolute() || !path.is_dir() {
panic!("MOZ_DIST must be an absolute directory, was: {}", path.display()); panic!("MOZ_TOPOBJDIR must be an absolute directory, was: {}", path.display());
} }
path path.join("dist")
}; };
static ref SEARCH_PATHS: Vec<PathBuf> = vec![ static ref SEARCH_PATHS: Vec<PathBuf> = vec![
DISTDIR_PATH.join("include"), DISTDIR_PATH.join("include"),