Skip to content
Permalink
Browse files

Support overriding the moztools path order.

  • Loading branch information
jdm committed Nov 27, 2019
1 parent 9b5c79f commit fcdf347d8381435ff6af7c933a886f7565f05b80
Showing with 8 additions and 2 deletions.
  1. +8 −2 python/servo/command_base.py
@@ -659,10 +659,16 @@ def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit
env["OPENSSL_LIB_DIR"] = path.join(openssl_base_dir, "lib")
env["OPENSSL_LIBS"] = "libssl:libcrypto"
# Link moztools, used for building SpiderMonkey
env["MOZTOOLS_PATH"] = os.pathsep.join([
moztools_paths = [
path.join(self.msvc_package_dir("moztools"), "bin"),
path.join(self.msvc_package_dir("moztools"), "msys", "bin"),
])
]
# In certain cases we need to ensure that tools with conflicting MSYS versions
# can be placed in the PATH ahead of the moztools directories.
moztools_path_prepend = env.get("MOZTOOLS_PATH_PREPEND", None)
if moztools_path_prepend:
moztools_paths.insert(0, moztools_path_prepend)
env["MOZTOOLS_PATH"] = os.pathsep.join(moztools_paths)
# Link autoconf 2.13, used for building SpiderMonkey
env["AUTOCONF"] = path.join(self.msvc_package_dir("moztools"), "msys", "local", "bin", "autoconf-2.13")
# Link LLVM

0 comments on commit fcdf347

Please sign in to comment.
You can’t perform that action at this time.