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

Bump cc for bootstrap #111701

Closed
wants to merge 6 commits into from
Closed

Bump cc for bootstrap #111701

wants to merge 6 commits into from

Conversation

r-value
Copy link

@r-value r-value commented May 18, 2023

Bump the version of dependency cc to 1.0.77 for bootstrap, syncing with rust/Cargo.lock

Resolves #111700

Bump the version of dependency `cc` to v1.0.77 for `bootstrap`, syncing with rust/Cargo.lock

Resolves rust-lang#111700
@rustbot
Copy link
Collaborator

rustbot commented May 18, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ozkanonur (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 18, 2023
@jyn514
Copy link
Member

jyn514 commented May 18, 2023

@bors r+ rollup

Thanks!

@bors
Copy link
Contributor

bors commented May 18, 2023

📌 Commit d371b80 has been approved by jyn514

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 May 18, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 19, 2023
Bump `cc` for `bootstrap`

Bump the version of dependency `cc` to `1.0.77` for `bootstrap`, syncing with `rust/Cargo.lock`

Resolves rust-lang#111700
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 19, 2023
Bump `cc` for `bootstrap`

Bump the version of dependency `cc` to `1.0.77` for `bootstrap`, syncing with `rust/Cargo.lock`

Resolves rust-lang#111700
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 19, 2023
Bump `cc` for `bootstrap`

Bump the version of dependency `cc` to `1.0.77` for `bootstrap`, syncing with `rust/Cargo.lock`

Resolves rust-lang#111700
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 21, 2023
Bump `cc` for `bootstrap`

Bump the version of dependency `cc` to `1.0.77` for `bootstrap`, syncing with `rust/Cargo.lock`

Resolves rust-lang#111700
@matthiaskrgr
Copy link
Member

@bors rollup=iffy

@bors
Copy link
Contributor

bors commented May 21, 2023

⌛ Testing commit d371b80 with merge e1013a37f5a22aca970190dcbdfb96a4b6b7e871...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented May 21, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 21, 2023
@jyn514
Copy link
Member

jyn514 commented May 22, 2023

cc @thomcc, seems like something regressed between cc 1.0.73 and .77. any idea what might have changed?

This version also resolves rust-lang#111700, try if we can bump to this release
without regression.
@jyn514
Copy link
Member

jyn514 commented May 22, 2023

@r-value fyi i don't want to bisect this in a full bors merge because it'll get merged if the test succeeds - feel free to test with PR CI though: https://rustc-dev-guide.rust-lang.org/tests/ci.html#using-ci-to-test

@r-value
Copy link
Author

r-value commented May 22, 2023

@r-value fyi i don't want to bisect this in a full bors merge because it'll get merged if the test succeeds - feel free to test with PR CI though: https://rustc-dev-guide.rust-lang.org/tests/ci.html#using-ci-to-test

Thank you very much for your suggestion! Actually, I'm pushing the commit because I think that if 1.0.74 works then it might have a chance to meet the merge window on May 26th so that we can resolve the issue ~1mo earlier. It's not a bisect because I'm not gonna push more commit if this fails :).
But I do need some suggestion about what should I do if 1.0.74 doesn't work. Should I force-push to undo the last commit, or append a new one to bump to 1.0.77, or just leave this branch unchanged?

@jyn514
Copy link
Member

jyn514 commented May 22, 2023

I don't want to merge 1.0.74. Let's figure out why this regressed and fix it either upstream or here.

I think that if 1.0.74 works then it might have a chance to meet the merge window on May 26th so that we can resolve the issue ~1mo earlier.

I don't mind beta-nominating the PR for a backport once we figure out the right fix.

@r-value
Copy link
Author

r-value commented May 22, 2023

I don't mind beta-nominating the PR for a backport once we figure out the right fix.

Thanks! Then what should I do about this branch? a force-push or leave it alone?

@jyn514
Copy link
Member

jyn514 commented May 22, 2023

Once you figure out the problem, force-pushing the fix so it's one commit would be good. Anything you want to do with it in the meantime is fine since it won't get merged.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels May 22, 2023
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@r-value
Copy link
Author

r-value commented May 23, 2023

I'm not familiar with Apple dev/test environments, but I suspect that rust-lang/cc-rs#661 may have set a wrong sdk_path for *-apple-ios targets.

Here is a diff between config commands of a succeeded and a failed test run.

--- fail.txt    2023-05-23 09:20:37.218611111 +0200
+++ success.txt 2023-05-23 09:20:05.004982583 +0200
@@ -32,7 +32,7 @@ DESTDIR=""
 -m64
 -mios-simulator-version-min=7.0
 -isysroot
-/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
+/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator15.5.sdk
 -fembed-bitcode
 -fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/llvm
 -miphoneos-version-min=10.0
@@ -42,7 +42,7 @@ DESTDIR=""
 -m64
 -mios-simulator-version-min=7.0
 -isysroot
-/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
+/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator15.5.sdk
 -fembed-bitcode
 -fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/llvm
 -fembed-bitcode=off"
@@ -59,6 +59,6 @@ DESTDIR=""
 -m64
 -mios-simulator-version-min=7.0
 -isysroot
-/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
+/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator15.5.sdk
 -fembed-bitcode"
 "-DCMAKE_BUILD_TYPE=Release"

@rust-log-analyzer

This comment has been minimized.

@klensy
Copy link
Contributor

klensy commented May 23, 2023

Looks like you didn't tried latest version or master branch, maybe already fixed?

@r-value
Copy link
Author

r-value commented May 23, 2023

Looks like you didn't tried latest version or master branch, maybe already fixed?

TBH I don't think it is fixed because it's still accepting SDKROOT unconditionally. I'll have a try anyway.

@rust-log-analyzer

This comment has been minimized.

@r-value
Copy link
Author

r-value commented May 23, 2023

I found something interesting here:

# macOS 10.15 onwards doesn't have libraries in /usr/include anymore: those
# are now located deep into the filesystem, under Xcode's own files. The
# native clang is configured to use the correct path, but our custom one
# doesn't. This sets the SDKROOT environment variable to the SDK so that
# our own clang can figure out the correct include path on its own.
ciCommandSetEnv SDKROOT "$(xcrun --sdk macosx --show-sdk-path)"

Maybe we need to set SDKROOT more precisely or just remove that since it will be ignored anyway if it has a mismatched value against current target.
I'll try to remove these code for now.

@rust-log-analyzer
Copy link
Collaborator

The job dist-apple-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
Updating files:  98% (40557/41384)
Updating files:  99% (40971/41384)
Updating files: 100% (41384/41384)
Updating files: 100% (41384/41384), done.
HEAD is now at a1bebd5c Merge fd1c67203d92019fc1bbd77ce4a1df95974fe459 into b08148f6a76010ea3d4e91d61245aa7aac59e4b4
[command]/usr/local/bin/git log -1 --format='%H'
'a1bebd5c848bfc2516cda59be6bb55b320c310d9'
'a1bebd5c848bfc2516cda59be6bb55b320c310d9'
##[group]Run echo "[CI_PR_NUMBER=$num]"
echo "[CI_PR_NUMBER=$num]"
env:
  CI_JOB_NAME: dist-apple-various
  CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
  SCCACHE_BUCKET: rust-lang-ci-sccache2
---
      System Firmware Version: VMW71.00V.13989454.B64.1906190538
      OS Loader Version: 540.120.3~22
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VM0cMowCzPY6
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 3
hw.byteorder: 1234
---
   Compiling profiler_builtins v0.0.0 (/Users/runner/work/rust/rust/library/profiler_builtins)
   Compiling alloc v0.0.0 (/Users/runner/work/rust/rust/library/alloc)
The following warnings were emitted during compilation:

warning: ../../src/llvm-project/compiler-rt/lib/profile/GCDAProfiling.c:24:10: fatal error: 'errno.h' file not found
warning: #include <errno.h>
warning: 1 error generated.

error: failed to run custom build command for `profiler_builtins v0.0.0 (/Users/runner/work/rust/rust/library/profiler_builtins)`


Caused by:
  process didn't exit successfully: `/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-std/release/build/profiler_builtins-a4b31b78e55f61bb/build-script-build` (exit status: 1)
  --- stdout
  TARGET = Some("x86_64-apple-darwin")
  OPT_LEVEL = Some("3")
  HOST = Some("x86_64-apple-darwin")
  cargo:rerun-if-env-changed=CC_x86_64-apple-darwin
  CC_x86_64-apple-darwin = None
  cargo:rerun-if-env-changed=CC_x86_64_apple_darwin
  CC_x86_64_apple_darwin = Some("sccache /Users/runner/work/rust/rust/clang+llvm-14.0.5-x86_64-apple-darwin/bin/clang")
  CFLAGS_x86_64-apple-darwin = None
  cargo:rerun-if-env-changed=CFLAGS_x86_64_apple_darwin
  CFLAGS_x86_64_apple_darwin = Some("-ffunction-sections -fdata-sections -fPIC --target=x86_64-apple-darwin -stdlib=libc++ -fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/a1bebd5c848bfc2516cda59be6bb55b320c310d9")
  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
  CRATE_CC_NO_DEFAULTS = None
  DEBUG = Some("true")
  running: "sccache" "/Users/runner/work/rust/rust/clang+llvm-14.0.5-x86_64-apple-darwin/bin/clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-gdwarf-2" "-fno-omit-frame-pointer" "--target=x86_64-apple-darwin" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-stdlib=libc++" "-fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/a1bebd5c848bfc2516cda59be6bb55b320c310d9" "-I" "../../src/llvm-project/compiler-rt/include" "-fno-builtin" "-fomit-frame-pointer" "-fvisibility=hidden" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-DCOMPILER_RT_HAS_ATOMICS=1" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-std/x86_64-apple-darwin/release/build/profiler_builtins-dae79822b045e16a/out/../../src/llvm-project/compiler-rt/lib/profile/GCDAProfiling.o" "-c" "../../src/llvm-project/compiler-rt/lib/profile/GCDAProfiling.c"
  cargo:warning=../../src/llvm-project/compiler-rt/lib/profile/GCDAProfiling.c:24:10: fatal error: 'errno.h' file not found
  cargo:warning=#include <errno.h>
  cargo:warning=         ^~~~~~~~~
  exit status: 1

  --- stderr



  error occurred: Command "sccache" "/Users/runner/work/rust/rust/clang+llvm-14.0.5-x86_64-apple-darwin/bin/clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-gdwarf-2" "-fno-omit-frame-pointer" "--target=x86_64-apple-darwin" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-apple-darwin" "-stdlib=libc++" "-fdebug-prefix-map=/Users/runner/work/rust/rust=/rustc/a1bebd5c848bfc2516cda59be6bb55b320c310d9" "-I" "../../src/llvm-project/compiler-rt/include" "-fno-builtin" "-fomit-frame-pointer" "-fvisibility=hidden" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-DCOMPILER_RT_HAS_ATOMICS=1" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-std/x86_64-apple-darwin/release/build/profiler_builtins-dae79822b045e16a/out/../../src/llvm-project/compiler-rt/lib/profile/GCDAProfiling.o" "-c" "../../src/llvm-project/compiler-rt/lib/profile/GCDAProfiling.c" with args "clang" did not execute successfully (status code exit status: 1).

warning: build failed, waiting for other jobs to finish...
Build completed unsuccessfully in 0:06:39

@onur-ozkan
Copy link
Member

PR was closed due to inactivity. If you plan to work on it again, you can reopen it.

@onur-ozkan onur-ozkan closed this Jul 19, 2023
@onur-ozkan onur-ozkan removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustc fails to build for target riscv64gc-unknown-linux-musl
8 participants