From c529bfa49e7fa9e3004dacf278b3e90b0be373b4 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 9 Nov 2023 10:17:19 +0100 Subject: [PATCH] Remove some stray references to OpenSSL (#30710) These were left over from the change to use rustls. --- docs/HACKING_QUICKSTART.md | 2 -- etc/shell.nix | 2 +- python/servo/platform/base.py | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/HACKING_QUICKSTART.md b/docs/HACKING_QUICKSTART.md index 24960afb131..2ca48d0cccb 100644 --- a/docs/HACKING_QUICKSTART.md +++ b/docs/HACKING_QUICKSTART.md @@ -33,8 +33,6 @@ Building Servo is quite easy. Install the prerequisites described in the [README ./mach build -d ``` -*Note: on Mac, you might run into an SSL issue while compiling. You'll find a solution to this problem [here](https://github.com/sfackler/rust-openssl/issues/255).* - There are three main build profiles, which you can build and use independently of one another: * debug builds, which allow you to use a debugger (lldb) diff --git a/etc/shell.nix b/etc/shell.nix index b2f1ea14bed..743dc5271c5 100644 --- a/etc/shell.nix +++ b/etc/shell.nix @@ -13,7 +13,7 @@ clangStdenv.mkDerivation rec { buildInputs = [ # Native dependencies - fontconfig freetype openssl libunwind + fontconfig freetype libunwind xorg.libxcb xorg.libX11 diff --git a/python/servo/platform/base.py b/python/servo/platform/base.py index 8af3e2056eb..d3d03cf80ef 100644 --- a/python/servo/platform/base.py +++ b/python/servo/platform/base.py @@ -51,8 +51,6 @@ class Base: f"gst-plugin-scanner{self.executable_suffix()}", ) env["GST_PLUGIN_SYSTEM_PATH"] = os.path.join(gstreamer_root, "lib", "gstreamer-1.0") - if self.is_macos: - env["OPENSSL_INCLUDE_DIR"] = os.path.join(gstreamer_root, "Headers") # If we are not cross-compiling GStreamer must be installed for the system. In # the cross-compilation case, we might be picking it up from another directory.