diff options
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index e858dc703e9..7d81b5a29ef 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -503,8 +503,13 @@ class CommandBase(object): env["OPENSSL_INCLUDE_DIR"] = path.join(package_dir("openssl"), "include") env["OPENSSL_LIB_DIR"] = path.join(package_dir("openssl"), "lib" + msvc_x64) env["OPENSSL_LIBS"] = "libsslMD:libcryptoMD" - # Link moztools - env["MOZTOOLS_PATH"] = path.join(package_dir("moztools"), "bin") + # Link moztools, used for building SpiderMonkey + env["MOZTOOLS_PATH"] = os.pathsep.join([ + path.join(package_dir("moztools"), "bin"), + path.join(package_dir("moztools"), "msys", "bin"), + ]) + # Link autoconf 2.13, used for building SpiderMonkey + env["AUTOCONF"] = path.join(package_dir("moztools"), "msys", "local", "bin", "autoconf-2.13") # Link LLVM env["LIBCLANG_PATH"] = path.join(package_dir("llvm"), "lib") @@ -650,21 +655,13 @@ class CommandBase(object): return "emulator" def handle_android_target(self, target): - if target == "arm-linux-androideabi": - self.config["android"]["platform"] = "android-18" - self.config["android"]["target"] = target - self.config["android"]["toolchain_prefix"] = target - self.config["android"]["arch"] = "arm" - self.config["android"]["lib"] = "armeabi" - self.config["android"]["toolchain_name"] = target + "-4.9" - return True - elif target == "armv7-linux-androideabi": + if target == "armv7-linux-androideabi": self.config["android"]["platform"] = "android-18" self.config["android"]["target"] = target self.config["android"]["toolchain_prefix"] = "arm-linux-androideabi" self.config["android"]["arch"] = "arm" self.config["android"]["lib"] = "armeabi-v7a" - self.config["android"]["toolchain_name"] = "arm-linux-androideabi-4.9" + self.config["android"]["toolchain_name"] = "arm-linux-androideabi" return True elif target == "aarch64-linux-android": self.config["android"]["platform"] = "android-21" @@ -672,15 +669,16 @@ class CommandBase(object): self.config["android"]["toolchain_prefix"] = target self.config["android"]["arch"] = "arm64" self.config["android"]["lib"] = "arm64-v8a" - self.config["android"]["toolchain_name"] = target + "-4.9" + self.config["android"]["toolchain_name"] = target return True elif target == "i686-linux-android": - self.config["android"]["platform"] = "android-18" + # https://github.com/jemalloc/jemalloc/issues/1279 + self.config["android"]["platform"] = "android-21" self.config["android"]["target"] = target self.config["android"]["toolchain_prefix"] = "x86" self.config["android"]["arch"] = "x86" self.config["android"]["lib"] = "x86" - self.config["android"]["toolchain_name"] = "x86-4.9" + self.config["android"]["toolchain_name"] = target return True return False |