Skip to content

Conversation

hugwijst
Copy link
Contributor

When building a binary on targets containing -apple-, the resulting .d file gets overwritten with the dependencies of the .dSYM file. Eg. in the changed unit test, foo.d would start with p.bin(foo).with_extension("dSYM") instead of p.bin(foo).

This PR fixes that problem by not generating .d dependency information files for outputs of the DebugInfo flavor.

@rust-highfive
Copy link

r? @ehuss

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 21, 2019
@ehuss
Copy link
Contributor

ehuss commented Jun 21, 2019

Thanks! Looks like there's an issue on windows.

@hugwijst
Copy link
Contributor Author

Thanks! Looks like there's an issue on windows.

Forgot path separators are different on Windows, should be fixed now.

@ehuss
Copy link
Contributor

ehuss commented Jul 6, 2019

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jul 6, 2019

📌 Commit 2c488c9 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 6, 2019
@bors
Copy link
Contributor

bors commented Jul 6, 2019

⌛ Testing commit 2c488c9 with merge 644c808...

bors added a commit that referenced this pull request Jul 6, 2019
Fix overwriting .d file for binary with dSYM on apple targets.

When building a binary on targets containing `-apple-`, the resulting `.d` file gets overwritten with the dependencies of the `.dSYM` file. Eg. in the changed unit test, `foo.d` would start with `p.bin(foo).with_extension("dSYM")` instead of `p.bin(foo)`.

This PR fixes that problem by not generating `.d` dependency information files for outputs of the `DebugInfo` flavor.
@bors
Copy link
Contributor

bors commented Jul 6, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: ehuss
Pushing 644c808 to master...

@bors bors merged commit 2c488c9 into rust-lang:master Jul 6, 2019
bors added a commit to rust-lang/rust that referenced this pull request Jul 10, 2019
Update cargo

Update cargo

12 commits in 4c1fa54d10f58d69ac9ff55be68e1b1c25ecb816..677a180f4c8ca1dcef594f68dd0e63e4f08621f5
2019-06-24 11:24:18 +0000 to 2019-07-08 13:43:02 +0000
- Update dependencies (rust-lang/cargo#7106)
- Fix overwriting .d file for binary with dSYM on apple targets. (rust-lang/cargo#7057)
- Update changelog. (rust-lang/cargo#7102)
- Revert "Fix 'getting started' internal links" (rust-lang/cargo#7099)
- Bump to 0.39.0 (rust-lang/cargo#7100)
- Update dependency.rs (rust-lang/cargo#7098)
- Typo (rust-lang/cargo#7097)
- Fix 'getting started' internal links (rust-lang/cargo#7093)
- Fix misleading comment in testsuite (rust-lang/cargo#7090)
- improve uncommitted changes cargo-package message (rust-lang/cargo#7083)
- Clean environment when git-fetch-with-cli is used. (rust-lang/cargo#7082)
- Fix exponentiality in depend_on_deps_of_deps. (rust-lang/cargo#7062)
@ehuss ehuss added this to the 1.38.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants