diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-09-20 16:24:08 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-10-02 15:00:29 -0400 |
| commit | 96302bad91887a030f54a9e233dabac60499679c (patch) | |
| tree | 3f296f166fe43c2d938018aef56b8106d02c48f6 /python/servo | |
| parent | 22e3797fb620b8b24b28abbce781ac0c0aa6ccda (diff) | |
| download | servo-96302bad91887a030f54a9e233dabac60499679c.tar.gz servo-96302bad91887a030f54a9e233dabac60499679c.zip | |
Update to UWP compatible OpenSSL build.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 5 | ||||
| -rw-r--r-- | python/servo/packages.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 5914edb53cf..b4343392479 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -234,7 +234,7 @@ class MachCommands(CommandBase): check_call(["rustup" + BIN_SUFFIX, "target", "add", "--toolchain", self.toolchain(), target]) - env = self.build_env(target=target, is_build=True) + env = self.build_env(target=target, is_build=True, uwp=uwp) self.ensure_bootstrapped(target=target) self.ensure_clobbered() diff --git a/python/servo/command_base.py b/python/servo/command_base.py index ee12594ee83..853c879d9af 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -614,7 +614,7 @@ install them, let us know by filing a bug!") 'vcdir': vcinstalldir, } - def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False): + def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False, uwp=False): """Return an extended environment dictionary.""" env = os.environ.copy() if sys.platform == "win32" and type(env['PATH']) == unicode: @@ -639,6 +639,9 @@ install them, let us know by filing a bug!") "i686": "x86-windows", "aarch64": "arm64-windows", } + target_arch = vcpkg_arch[arch] + if uwp: + target_arch += "-uwp" openssl_base_dir = path.join(self.msvc_package_dir("openssl"), vcpkg_arch[arch]) # Link openssl diff --git a/python/servo/packages.py b/python/servo/packages.py index 98d15623573..0af54b4aad5 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -8,7 +8,7 @@ WINDOWS_MSVC = { "moztools": "3.2", "ninja": "1.7.1", "nuget": "08-08-2019", - "openssl": "111.3.0+1.1.1c-vs2017", + "openssl": "111.3.0+1.1.1c-vs2017-2019-09-18", "gstreamer-uwp": "1.16.0.5", "openxr-loader-uwp": "1.0", } |