diff options
author | Martin Robinson <mrobinson@igalia.com> | 2023-12-06 18:36:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-06 17:36:07 +0000 |
commit | 7e82c5c957821f1328484e90becec0cfb5572938 (patch) | |
tree | aa4d6d8381565199e7173b5f3828ba1c26337f14 /python/servo/platform/linux.py | |
parent | 9c443cf2c1bbcee1f465cc76b7bf1ab551b85877 (diff) | |
download | servo-7e82c5c957821f1328484e90becec0cfb5572938.tar.gz servo-7e82c5c957821f1328484e90becec0cfb5572938.zip |
Compile Servo with the latest version of rust stable (#30831)
This completes the transition to compiling Servo with rust stable. Some
nightly-only features are still used when compiling the `script` and
`crown` crates, as well as for some style unit tests. These will likely
break with newer compiler versions, but `crown` can be disabled for them
conditionally. This is just the first step.
This has some caveats:
1. We need to disable setting up the special linker on Linux. The -Z
option isn't supported with stable rust so using this is out --
meanwhile we can't be sure that lld is installed on most systems.
2. `cargo fmt` still uses some unstable options, so we need to rely on
the unstable toolchain just for running `fmt`. The idea is to fix this
gradually.
Diffstat (limited to 'python/servo/platform/linux.py')
-rw-r--r-- | python/servo/platform/linux.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/python/servo/platform/linux.py b/python/servo/platform/linux.py index 2839bd1f108..8496bd7fe6a 100644 --- a/python/servo/platform/linux.py +++ b/python/servo/platform/linux.py @@ -150,17 +150,6 @@ class Linux(Base): installed_something |= self._platform_bootstrap_gstreamer(force) return installed_something - def linker_flag(self) -> str: - # the rust-lld binary downloaded by rustup - # doesn't respect NIX_LDFLAGS and also needs - # other patches to work correctly. Use system - # version of lld for now. See - # https://github.com/NixOS/nixpkgs/issues/220717 - if self.distro.lower() == 'nixos': - return '-C link-arg=-fuse-ld=lld' - else: - return '-Zgcc-ld=lld' - def install_non_gstreamer_dependencies(self, force: bool) -> bool: install = False pkgs = [] |