diff options
| author | bors-servo <servo-ops@mozilla.com> | 2021-02-25 14:28:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 14:28:24 -0500 |
| commit | 6e1350f3aa69750afa3bd76ca085deb90a56d980 (patch) | |
| tree | 9be81eb759ff29b67880ae74c007750bb70cc163 | |
| parent | 30f927f67b797a7c891407a9d73252ce4ee7ac3d (diff) | |
| parent | 47fc8f9697a9f9ab73b7196be41e5228d914c415 (diff) | |
| download | servo-6e1350f3aa69750afa3bd76ca085deb90a56d980.tar.gz servo-6e1350f3aa69750afa3bd76ca085deb90a56d980.zip | |
Auto merge of #27647 - jdm:build-std, r=SimonSapin
Use build-std instead of xargo.
The changes to num-integer and indexmap are to work around https://github.com/cuviper/autocfg/issues/34.
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | components/script/Cargo.toml | 2 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 1 | ||||
| -rw-r--r-- | python/servo/command_base.py | 6 | ||||
| -rw-r--r-- | python/servo/packages.py | 1 |
5 files changed, 5 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2b6b3f411f1..baaf758cb72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4026,9 +4026,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.42" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg", "num-traits", diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 3a3767906a1..68ac6638907 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -60,7 +60,7 @@ http = "0.1" hyper = "0.12" hyper_serde = "0.11" image = "0.23" -indexmap = "1.0.2" +indexmap = { version = "1.0.2", features = ["std"] } ipc-channel = "0.14" itertools = "0.8" js = { package = "mozjs", git = "https://github.com/servo/rust-mozjs" } diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 7095cfbcad4..a3aae798eac 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -273,7 +273,6 @@ class MachCommands(CommandBase): if uwp: # Ensure libstd is ready for the new UWP target. check_call(["rustup", "component", "add", "rust-src"]) - env['RUST_SYSROOT'] = path.expanduser('~\\.xargo') # Don't try and build a desktop port. libsimpleservo = True diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 9f63a579f48..0ba6a823756 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -608,7 +608,6 @@ 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 = { @@ -932,9 +931,8 @@ install them, let us know by filing a bug!") args += ["--features", " ".join(features)] 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) + cargo_args += ["-Z", "build-std"] + 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") diff --git a/python/servo/packages.py b/python/servo/packages.py index 6a7b375964f..7e0f9bd5d03 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -11,5 +11,4 @@ WINDOWS_MSVC = { "openssl": "111.3.0+1.1.1c-vs2017-2019-09-18", "gstreamer-uwp": "1.16.0.5", "openxr-loader-uwp": "1.0", - "xargo": "v0.3.22", } |