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

Disable all shared library code #170

Merged
merged 2 commits into from Mar 5, 2019
Merged

Disable all shared library code #170

merged 2 commits into from Mar 5, 2019

Conversation

@jdm
Copy link
Member

jdm commented Feb 27, 2019

This should work around the duplicate DllMain that's appearing in servo/servo#22856.


This change is Reviewable

@asajeffrey
Copy link
Member

asajeffrey commented Feb 28, 2019

LGTM. Needs squashing down to 2 commits, the second just doing the version bump, then r=me.

@jdm jdm force-pushed the jdm-patch-4 branch from 328e69b to 8d23ae1 Mar 5, 2019
@jdm
Copy link
Member Author

jdm commented Mar 5, 2019

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Mar 5, 2019

📌 Commit 8d23ae1 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Mar 5, 2019

Testing commit 8d23ae1 with merge 923e005...

bors-servo added a commit that referenced this pull request Mar 5, 2019
Disable all shared library code

This should work around the duplicate DllMain that's appearing in servo/servo#22856.

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

bors-servo commented Mar 5, 2019

💔 Test failed - checks-travis

@jdm
Copy link
Member Author

jdm commented Mar 5, 2019

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Mar 5, 2019

Testing commit 8d23ae1 with merge 49d63a8...

bors-servo added a commit that referenced this pull request Mar 5, 2019
Disable all shared library code

This should work around the duplicate DllMain that's appearing in servo/servo#22856.

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

bors-servo commented Mar 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: asajeffrey
Pushing 49d63a8 to master...

@bors-servo bors-servo merged commit 8d23ae1 into master Mar 5, 2019
5 checks passed
5 checks passed
Travis CI - Branch Build Passed
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
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

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