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

Don't print cargo:include= with pkg-config #148

Merged
merged 1 commit into from Apr 18, 2019

Conversation

@spl
Copy link
Contributor

spl commented Apr 18, 2019

I introduced this in 692048e, but it's the wrong thing to do. When a dependent crate gets the pkg-config include paths in DEP_HARFBUZZ_INCLUDE, it may also need other aspects such as the link paths, but it doesn't know that information is available from pkg-config. So, the dependent crate must assume that, if DEP_HARFBUZZ_INCLUDE is not available, it should use pkg-config.


This change is Reviewable

I introduced this in 692048e, but it's
the wrong thing to do. When a dependent crate gets the pkg-config
include paths in DEP_HARFBUZZ_INCLUDE, it may also need other aspects
such as the link paths, but it doesn't know that information is
available from pkg-config. So, the dependent crate must assume that, if
DEP_HARFBUZZ_INCLUDE is not available, it should use pkg-config.
@spl spl force-pushed the spl:no-include-with-pkg-config branch from f344b00 to 2a61777 Apr 18, 2019
@jdm
Copy link
Member

jdm commented Apr 18, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Apr 18, 2019

📌 Commit 2a61777 has been approved by jdm

bors-servo added a commit that referenced this pull request Apr 18, 2019
Don't print cargo:include= with pkg-config

I introduced this in 692048e, but it's the wrong thing to do. When a dependent crate gets the `pkg-config` include paths in `DEP_HARFBUZZ_INCLUDE`, it may also need other aspects such as the link paths, but it doesn't know that information is available from `pkg-config`. So, the dependent crate must assume that, if `DEP_HARFBUZZ_INCLUDE` is not available, it should use `pkg-config`.

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

bors-servo commented Apr 18, 2019

Testing commit 2a61777 with merge 5249e3f...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 18, 2019

☀️ Test successful - checks-travis
Approved by: jdm
Pushing 5249e3f to master...

@bors-servo bors-servo merged commit 2a61777 into servo:master Apr 18, 2019
3 checks passed
3 checks passed
Travis CI - Pull Request Build Passed
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.