diff options
| author | Mike Hommey <mh+mozilla@glandium.org> | 2023-06-06 23:44:05 +0200 |
|---|---|---|
| committer | Oriol Brufau <obrufau@igalia.com> | 2023-06-09 11:18:06 +0200 |
| commit | d32c5ed85fadd207757f94e04904e2b33c1f443d (patch) | |
| tree | 9b637d618b4df5ca555436b20270ce42d9f861af /components/style/build_gecko.rs | |
| parent | 54878595b30c6e9d2fe49946d882db00c55c8e44 (diff) | |
| download | servo-d32c5ed85fadd207757f94e04904e2b33c1f443d.tar.gz servo-d32c5ed85fadd207757f94e04904e2b33c1f443d.zip | |
style: Remove MOZ_DIST
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
Diffstat (limited to 'components/style/build_gecko.rs')
| -rw-r--r-- | components/style/build_gecko.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs index ddf4a8b71ef..848ea50f8de 100644 --- a/components/style/build_gecko.rs +++ b/components/style/build_gecko.rs @@ -58,11 +58,11 @@ lazy_static! { }; static ref INCLUDE_RE: Regex = Regex::new(r#"#include\s*"(.+?)""#).unwrap(); 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() { - 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![ DISTDIR_PATH.join("include"), |