diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-24 14:15:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 14:15:11 -0400 |
| commit | 483010ec8b9afe5f450bbae192bc82c0bbd23779 (patch) | |
| tree | e486fa612bca84abb17a44b1ff9b13b5be787e81 /python/servo/build_commands.py | |
| parent | 5603ebfa5625016279527b76604128794c1f312a (diff) | |
| parent | fcec1af22d2d51591aa4b872dd316939366b3c30 (diff) | |
| download | servo-483010ec8b9afe5f450bbae192bc82c0bbd23779.tar.gz servo-483010ec8b9afe5f450bbae192bc82c0bbd23779.zip | |
Auto merge of #21777 - servo:jdm-patch-29, r=asajeffrey
Fix a mac cross-compilation problem
This fixes one of two problems that prevents cross-compiling for Android on Mac.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21777)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 8182f42dc9e..253163daefc 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -343,6 +343,7 @@ class MachCommands(CommandBase): 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 @@ class MachCommands(CommandBase): "--gcc-toolchain=" + gcc_toolchain, "-I" + support_include, "-I" + cxx_include, + "-I" + clang_include, "-isystem", sysroot_include, "-L" + gcc_libs, "-D__STDC_CONSTANT_MACROS", |