Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update mozjs and use moztools infra (#30292)

Browse source
This commit is contained in:
Samson 2023-09-05 18:52:50 +02:00 • committed by GitHub
parent 2b21d0015d
commit 8a011a4487
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3749,7 +3749,7 @@ checksum = "903970ae2f248d7275214cf8f387f8ba0c4ea7e3d87a320e85493db60ce28616"
[[package]] [[package]]
name = "mozjs" name = "mozjs"
version = "0.14.1" version = "0.14.1"
source = "git+https://github.com/servo/mozjs#821687091d68e9f98809a60a9111f6d612c0bdb9" source = "git+https://github.com/servo/mozjs#8dcf64e1dd1c362b2af3abb735f100bdff8a627d"
dependencies = [ dependencies = [
"cc", "cc",
"lazy_static", "lazy_static",
@ -3762,7 +3762,7 @@ dependencies = [
[[package]] [[package]]
name = "mozjs_sys" name = "mozjs_sys"
version = "0.68.2" version = "0.68.2"
source = "git+https://github.com/servo/mozjs#821687091d68e9f98809a60a9111f6d612c0bdb9" source = "git+https://github.com/servo/mozjs#8dcf64e1dd1c362b2af3abb735f100bdff8a627d"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cc", "cc",

5
python/servo/command_base.py
View file

@ -466,11 +466,6 @@ class CommandBase(object):
effective_target = self.cross_compile_target or servo.platform.host_triple() effective_target = self.cross_compile_target or servo.platform.host_triple()
if "msvc" in effective_target: if "msvc" in effective_target:
# This environment variable is necessary for building mozjs. It would
# be nice to be able to set it in the cargo configuration somehow, but it
# is platform-dependent.
env["MOZILLA_BUILD"] = path.join(self.msvc_package_dir("moztools"))
# Always build harfbuzz from source # Always build harfbuzz from source
env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true" env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"