diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-09-15 14:05:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-15 14:05:00 -0500 |
commit | a3b85cbd6cd74090b6e9f09e3d0980045e8f6a1b (patch) | |
tree | 8ca39d2c4b5e9deeec96dc17d344f3078043a9d2 /components/script/task_source | |
parent | fb00fc222a1fd4c3c664f3d5dfbe5cacecb0c681 (diff) | |
parent | fbdb2093dda5f7d2b6bfa0c48405484dc69ab4b4 (diff) | |
download | servo-a3b85cbd6cd74090b6e9f09e3d0980045e8f6a1b.tar.gz servo-a3b85cbd6cd74090b6e9f09e3d0980045e8f6a1b.zip |
Auto merge of #18031 - jhlin:android-build-on-macos, r=mbrubeck
Fix Android build errors on macOS.
- Add sysroot path to environment variable 'CPPFLAGS':
When checking C preprocessor, the 'configure' script of libbacktrace uses 'CPPFLAGS' rather than 'CFLAGS' and doesn't get the correct search path. (#15758)
This check passes on Linux because the '/lib/cpp' fallback is available there.
- Introduce CMake toolchain file for Android cross compiling:
CMake needs several variables [1] to cross compile for Android.
It works (accidentally) on Linux because cmake-rs sets compilers correctly and binutils for Linux & Android are pretty much the same.
[1] https://cmake.org/cmake/help/v3.7/manual/cmake-toolchains.7.html#cross-compiling-for-android-with-the-ndk
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #15758 (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a fix to build errors.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/18031)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/task_source')
0 files changed, 0 insertions, 0 deletions