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 build errors when cross-compiling to android on mac. #21474

Closed
wants to merge 2 commits into from

Conversation

@jdm
Copy link
Member

jdm commented Aug 21, 2018

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #21469
  • These changes do not require tests because how ridiculous would it be to have CI for a tier 1 platform?

This change is Reviewable

@highfive
Copy link

highfive commented Aug 21, 2018

Heads up! This PR modifies the following files:

@jdm
Copy link
Member Author

jdm commented Aug 21, 2018

@bors-servo try=android

bors-servo added a commit that referenced this pull request Aug 21, 2018
Fix build errors when cross-compiling to android on mac.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #21469
- [x] These changes do not require tests because how ridiculous would it be to have CI for a tier 1 platform?
@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2018

Trying commit afdaf5f with merge 8aaa858...

@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2018

💔 Test failed - android-x86

@jdm
Copy link
Member Author

jdm commented Aug 21, 2018

@bors-servo try=android

@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2018

Trying commit fba7b02 with merge 9320470...

bors-servo added a commit that referenced this pull request Aug 21, 2018
Fix build errors when cross-compiling to android on mac.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #21469
- [x] These changes do not require tests because how ridiculous would it be to have CI for a tier 1 platform?

<!-- 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/21474)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 21, 2018

💔 Test failed - android-x86

@paulrouget
Copy link
Contributor

paulrouget commented Aug 22, 2018

/usr/lib/llvm-4.0/lib/ doesn't exist on my machine.

@jdm
Copy link
Member Author

jdm commented Aug 22, 2018

You can ignore that commit.

@bors-servo
Copy link
Contributor

bors-servo commented Aug 22, 2018

The latest upstream changes (presumably #21470) made this pull request unmergeable. Please resolve the merge conflicts.

@jdm
Copy link
Member Author

jdm commented Sep 3, 2018

@asajeffrey

This comment has been minimized.

Copy link

asajeffrey commented on python/servo/build_commands.py in afdaf5f Sep 6, 2018

Shouldn't this be path.join(llvm_toolchain, "lib64", "clang", "3.8", "include")?

This comment has been minimized.

Copy link
Owner Author

jdm replied Sep 6, 2018

Indeed.

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.

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