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 macOS/Android cross-compile. #139

Merged
merged 4 commits into from
Jun 19, 2018
Merged

Fix macOS/Android cross-compile. #139

merged 4 commits into from
Jun 19, 2018

Conversation

jdm
Copy link
Member

@jdm jdm commented Jun 18, 2018

These changes allow my local Servo android build to complete.


This change is Reviewable

@jdm
Copy link
Member Author

jdm commented Jun 18, 2018

cc @paulrouget

@asajeffrey
Copy link
Member

Sigh, we have to a) specify the -include twice to get round flags being named different things on msvc and clang, and b) use an unreleased version of libloading. But it works! Let's see what homu has to say! @bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit f4b3871 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

⌛ Testing commit f4b3871 with merge 05e8401...

bors-servo pushed a commit that referenced this pull request Jun 18, 2018
Fix macOS/Android cross-compile.

These changes allow my local Servo android build to complete.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/139)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: asajeffrey
Pushing 05e8401 to master...

@bors-servo bors-servo merged commit f4b3871 into master Jun 19, 2018
@bors-servo bors-servo mentioned this pull request Jun 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants