Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a mac cross-compilation problem #21777

Merged
merged 1 commit into from Sep 24, 2018
+2 −0
Merged

Fix a mac cross-compilation problem #21777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Loading status checks…

Add clang system header include path when building android.

  • Loading branch information
@jdm
jdm committed Sep 21, 2018
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
commit fcec1af22d2d51591aa4b872dd316939366b3c30
2 python/servo/build_commands.py
View file
Open in desktop
@@ -343,6 +343,7 @@ def build(self, target=None, release=False, dev=False, jobs=None,
support_include = path.join(env['ANDROID_NDK'], "sources", "android", "support", "include")
cxx_include = path.join(env['ANDROID_NDK'], "sources", "cxx-stl",
"llvm-libc++", "libcxx", "include")
clang_include = path.join(llvm_toolchain, "lib64", "clang", "3.8", "include")
sysroot_include = path.join(env['ANDROID_SYSROOT'], "usr", "include")
env['HOST_CC'] = host_cc
env['HOST_CXX'] = host_cxx
@@ -381,6 +382,7 @@ def build(self, target=None, release=False, dev=False, jobs=None,
"--gcc-toolchain=" + gcc_toolchain,
"-I" + support_include,
"-I" + cxx_include,
"-I" + clang_include,
"-isystem", sysroot_include,
"-L" + gcc_libs,
"-D__STDC_CONSTANT_MACROS",
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.