Skip to content
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 android #68

Merged
merged 2 commits into from Oct 23, 2016
Merged

Fix android #68

merged 2 commits into from Oct 23, 2016

Conversation

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Oct 20, 2016

r? @mbrubeck

The issue here is that now that we're not using the NDK toolchain, the compilers won't "magically" figure out all of the include paths. These have all been set up in CXXINCLUDE but we need to pass them to CPPINCLUDE in order for the C preprocessor to also be able to pick up the hodge-podge of include directories.


This change is Reviewable

@mbrubeck
Copy link
Contributor

mbrubeck commented Oct 20, 2016

This seems fragile, since we (or individual developers) could put things into CXXFLAGS that aren't valid in CPPFLAGS. Can whatever is putting the include flags into CXXFLAGS put them into CPPFLAGS instead?

@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Oct 20, 2016

Sure! That's coming in another PR (to servo/servo), and I can set it there, too.

@larsbergstrom larsbergstrom force-pushed the larsbergstrom:fix_android branch from df59bc2 to aa26f3a Oct 20, 2016
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Oct 20, 2016

OK, fixed :-)

@mbrubeck
Copy link
Contributor

mbrubeck commented Oct 21, 2016

@emilio
Copy link
Member

emilio commented Oct 23, 2016

@bors-servo: r=mbrubeck

@bors-servo
Copy link
Contributor

bors-servo commented Oct 23, 2016

📌 Commit aa26f3a has been approved by mbrubeck

@bors-servo
Copy link
Contributor

bors-servo commented Oct 23, 2016

Test exempted - status

@bors-servo bors-servo merged commit aa26f3a into servo:master Oct 23, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
bors-servo added a commit that referenced this pull request Oct 23, 2016
Fix android

r? @mbrubeck

The issue here is that now that we're not using the NDK toolchain, the compilers won't "magically" figure out all of the include paths. These have all been set up in `CXXINCLUDE` but we need to pass them to `CPPINCLUDE` in order for the C preprocessor to also be able to pick up the hodge-podge of include directories.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-harfbuzz/68)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.