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

Update non-bootstrap cc dependency to fix compile family detection warning #123644

Merged
merged 1 commit into from
Apr 13, 2024

Conversation

dtolnay
Copy link
Member

@dtolnay dtolnay commented Apr 8, 2024

x.py check compiler/rustc_llvm Before:

(rust-lang/cc-rs#958)

Checking stage0 compiler artifacts {rustc_llvm} (x86_64-unknown-linux-gnu)
   Compiling cc v1.0.90
   Compiling libc v0.2.153
   Compiling rustc_llvm v0.0.0
warning: rustc_llvm@0.0.0: Compiler version doesn't include clang or GCC: "c++" "--version"
    Finished `release` profile [optimized] target(s) in 28.09s

After:

Checking stage0 compiler artifacts {rustc_llvm} (x86_64-unknown-linux-gnu)
   Compiling libc v0.2.153
   Compiling cc v1.0.92
   Compiling rustc_llvm v0.0.0
    Finished `release` profile [optimized] target(s) in 29.06s

@rustbot
Copy link
Collaborator

rustbot commented Apr 8, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Apr 8, 2024

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 8, 2024
@ChrisDenton
Copy link
Member

See also #122504 and #122507

@dtolnay dtolnay changed the title Update cc dependency to fix compile family detection warning Update non-bootstrap cc dependency to fix compile family detection warning Apr 8, 2024
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Apr 13, 2024

📌 Commit 224edac has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Apr 13, 2024
@bors
Copy link
Contributor

bors commented Apr 13, 2024

⌛ Testing commit 224edac with merge 0bf471f...

@bors
Copy link
Contributor

bors commented Apr 13, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 0bf471f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 13, 2024
@bors bors merged commit 0bf471f into rust-lang:master Apr 13, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 13, 2024
@dtolnay dtolnay deleted the cc branch April 13, 2024 23:48
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
##[endgroup]
Secret source: Actions
Prepare workflow directory
Prepare all required actions
Complete job name: skip if S-waiting-on-bors
##[group]Run # Fetch state and labels of PR
# Fetch state and labels of PR
# Or exit successfully if PR does not exist
JSON=$(gh pr view cargo_update --repo $GITHUB_REPOSITORY --json labels,state || exit 0)
STATE=$(echo "$JSON" | jq -r '.state')
WAITING_ON_BORS=$(echo "$JSON" | jq '.labels[] | any(.name == "S-waiting-on-bors"; .)')

# Exit with error if open and S-waiting-on-bors
if [[ "$STATE" == "OPEN" && "$WAITING_ON_BORS" == "true" ]]; then
fi
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0bf471f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 675.288s -> 676.211s (0.14%)
Artifact size: 316.04 MiB -> 316.06 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

7 participants