aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-09 22:41:10 -0800
committerGitHub <noreply@github.com>2017-01-09 22:41:10 -0800
commited3f53211ca91a90258c9bc2b8abceddb34e6847 (patch)
tree39c8b1ff5f9c1be413322f5aedeff2b063959f19
parentb0a6808956cd861ab5435a6d2a698aa6f5bf096d (diff)
parentbf11fe3531723cbdf1e0ff4ba6aac18afbb33f1e (diff)
downloadservo-ed3f53211ca91a90258c9bc2b8abceddb34e6847.tar.gz
servo-ed3f53211ca91a90258c9bc2b8abceddb34e6847.zip
Auto merge of #14932 - Manishearth:abspath, r=jdm
Expand ~ in --with-gecko for ./mach build-geckolib Otherwise `~/foo` expands to `/local/folder/~/foo`. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14932) <!-- Reviewable:end -->
-rw-r--r--python/servo/build_commands.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index bd09221d56f..8948aecd4bd 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -408,7 +408,7 @@ class MachCommands(CommandBase):
opts = []
if with_gecko is not None:
opts += ["--features", "bindgen"]
- env["MOZ_DIST"] = path.abspath(with_gecko)
+ env["MOZ_DIST"] = path.abspath(path.expanduser(with_gecko))
if jobs is not None:
opts += ["-j", jobs]
if verbose: