diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2018-05-30 14:44:47 -0500 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2018-05-30 14:44:47 -0500 |
| commit | d0cc9d2cd56a197fdfb72d8c0168d4cf2bb23bdb (patch) | |
| tree | 150c4f8b1b07d2fcc5944315954e1414552768c2 /python/servo | |
| parent | 0786e34a3af55377f2d9eac81c0960a8b13acfda (diff) | |
| download | servo-d0cc9d2cd56a197fdfb72d8c0168d4cf2bb23bdb.tar.gz servo-d0cc9d2cd56a197fdfb72d8c0168d4cf2bb23bdb.zip | |
Updated to mozjs v0.7.1.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 3 | ||||
| -rw-r--r-- | python/servo/packages.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d6b38c35156..9387535ec81 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -478,6 +478,7 @@ class CommandBase(object): return path.join(msvc_deps_dir, package, msvc_deps[package]) extra_path += [path.join(package_dir("cmake"), "bin")] + extra_path += [path.join(package_dir("llvm"), "bin")] extra_path += [path.join(package_dir("ninja"), "bin")] # Link openssl env["OPENSSL_INCLUDE_DIR"] = path.join(package_dir("openssl"), "include") @@ -485,6 +486,8 @@ class CommandBase(object): env["OPENSSL_LIBS"] = "libsslMD:libcryptoMD" # Link moztools env["MOZTOOLS_PATH"] = path.join(package_dir("moztools"), "bin") + # Link LLVM + env["LIBCLANG_PATH"] = path.join(package_dir("llvm"), "lib") if is_windows(): if not os.environ.get("NATIVE_WIN32_PYTHON"): diff --git a/python/servo/packages.py b/python/servo/packages.py index d368c91504c..da779051cb9 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -4,6 +4,7 @@ WINDOWS_MSVC = { "cmake": "3.7.2", + "llvm": "4.0.0", "moztools": "0.0.1-5", "ninja": "1.7.1", "openssl": "1.1.0e-vs2015", |