diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-10-12 16:08:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 16:08:48 -0400 |
| commit | eee2c895f41081750e34c2ecc6e95e7e1cbac784 (patch) | |
| tree | 85e80c6d4ca1fe84d54f67b34ef5208cf54dc30c /python/servo/command_base.py | |
| parent | 228b34aed8ad9a368fd537cf3811d53277ee1ce5 (diff) | |
| parent | 98123059420301308714b476eb84cbf72bc21980 (diff) | |
| download | servo-eee2c895f41081750e34c2ecc6e95e7e1cbac784.tar.gz servo-eee2c895f41081750e34c2ecc6e95e7e1cbac784.zip | |
Auto merge of #24198 - jdm:xargo-uwp3, r=SimonSapin
Build UWP with native UWP rustc target
<!-- 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/24198)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 90623613489..7f4e941a4c7 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -634,6 +634,7 @@ install them, let us know by filing a bug!") extra_path += [path.join(self.msvc_package_dir("llvm"), "bin")] extra_path += [path.join(self.msvc_package_dir("ninja"), "bin")] extra_path += [self.msvc_package_dir("nuget")] + extra_path += [path.join(self.msvc_package_dir("xargo"))] arch = (target or host_triple()).split('-')[0] vcpkg_arch = { @@ -821,11 +822,6 @@ install them, let us know by filing a bug!") action='store_true', help='Build with frame pointer enabled, used by the background hang monitor.', ), - CommandArgument( - '--uwp', - default=None, - action='store_true', - help='Build for HoloLens (x64)'), CommandArgument('--with-raqote', default=None, action='store_true'), CommandArgument('--with-layout-2020', default=None, action='store_true'), CommandArgument('--without-wgl', default=None, action='store_true'), @@ -912,7 +908,10 @@ install them, let us know by filing a bug!") assert "--features" not in cargo_args args += ["--features", " ".join(features)] - return self.call_rustup_run(["cargo", command] + args + cargo_args, env=env, verbose=verbose) + if target and 'uwp' in target: + return call(["xargo", command] + args + cargo_args, env=env, verbose=verbose) + else: + return self.call_rustup_run(["cargo", command] + args + cargo_args, env=env, verbose=verbose) def android_support_dir(self): return path.join(self.context.topdir, "support", "android") |