Update mozjs_sys to include cross-compilation fixes.

servo · Jun 19, 2018 · 2544db1 · 2544db1
1 parent a07c718
commit 2544db1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
@@ -330,14 +330,18 @@ def build(self, target=None, release=False, dev=False, jobs=None,
                 env['ANDROID_NDK'], "sources", "cxx-stl", "llvm-libc++", "libcxx", "include")
             cxxabi_include = path.join(
                 env['ANDROID_NDK'], "sources", "cxx-stl", "llvm-libc++abi", "libcxxabi", "include")
+            sysroot_include = path.join(
+                env['ANDROID_SYSROOT'], "usr", "include")
+            env['HOST_CFLAGS'] = ''
             env['CFLAGS'] = ' '.join([
-                "--sysroot", env['ANDROID_SYSROOT'],
+                "--sysroot=" + env['ANDROID_SYSROOT'],
                 "-I" + support_include])
             env['CXXFLAGS'] = ' '.join([
-                "--sysroot", env['ANDROID_SYSROOT'],
+                "--sysroot=" + env['ANDROID_SYSROOT'],
                 "-I" + support_include,
                 "-I" + cxx_include,
-                "-I" + cxxabi_include])
+                "-I" + cxxabi_include,
+                "-I" + sysroot_include])
             env["NDK_ANDROID_VERSION"] = android_platform.replace("android-", "")
             env['CPPFLAGS'] = ' '.join(["--sysroot", env['ANDROID_SYSROOT']])
             env["CMAKE_ANDROID_ARCH_ABI"] = self.config["android"]["lib"]