Add layering_check support for macOS #22475
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
second commit here should fix the reason it was reverted. Can we verify before landing? |
github-actions
bot
added
team-Rules-CPP
This was referenced May 21, 2024
keith
force-pushed
the
ks/add-layering_check-support-for-macos
branch
from
c8f1902
to
1c99414
Compare
This was referenced May 21, 2024
keith
force-pushed
the
ks/add-layering_check-support-for-macos
branch
2 times, most recently
from
7e0129a
to
e94020c
Compare
|
We disabled the bootstrap test for Intel mac to save presubmit time, probably we should re-enable it in https://github.com/bazelbuild/bazel/blob/master/.bazelci/presubmit.yml#L217 |
|
You think that should catch it? enabling those 2 here to see |
|
One of them should do, those two takes a long time to run, the only difference is the archive format. |
keith
force-pushed
the
ks/add-layering_check-support-for-macos
branch
from
ae7c951
to
8bc99be
Compare
|
added one back! |
meteorcloudy
added
awaiting-PR-merge
|
@meteorcloudy @keith do we need to squash the commits because it has a third party change? cc: @bazelbuild/triage |
|
Yeah, unfortunately the |
keith
force-pushed
the
ks/add-layering_check-support-for-macos
branch
2 times, most recently
from
10c86cf
to
de1d2d2
Compare
|
done! |
|
looks like https://bazel-review.googlesource.com/c/bazel/+/251183 might be stuck |
copybara-service bot
pushed a commit
that referenced
this pull request
May 24, 2024
There were 2 things with the previous implementation that needed to be improved here: 1. Apple Clang has a bug where it doesn't pass module compiler flags to the underlying -cc1 invocation, so we have to manually pass them directly to that invocation with -Xclang 2. The previous search script was too aggressive and slow for macOS. The macOS SDK has tons of files that aren't headers, and tons of symlinks pointing to other files within the SDK. This adds a fork in the script to run a version that works with Apple SDKs. The time difference on my machine is 41s->6s. 6s is still pretty long so if desired we can put this behavior behind an env var for users to opt in with. I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths. Closes #22259. This reverts commit 1f1b4fd. Partial commit for third_party/*, see #22475. Change-Id: I801121e36de1504c17adfa4736c49c88d470fec0 Signed-off-by: Hee Cha <heec@google.com>
There were 2 things with the previous implementation that needed to be improved here: 1. Apple Clang has a bug where it doesn't pass module compiler flags to the underlying -cc1 invocation, so we have to manually pass them directly to that invocation with -Xclang 2. The previous search script was too aggressive and slow for macOS. The macOS SDK has tons of files that aren't headers, and tons of symlinks pointing to other files within the SDK. This adds a fork in the script to run a version that works with Apple SDKs. The time difference on my machine is 41s->6s. 6s is still pretty long so if desired we can put this behavior behind an env var for users to opt in with. I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths. Closes bazelbuild#22259. This reverts commit 1f1b4fd.
keith
force-pushed
the
ks/add-layering_check-support-for-macos
branch
from
de1d2d2
to
13a6f7e
Compare
|
rebased now that the 3rd party change is in |
|
@meteorcloudy should I rebase this one again? |
|
I'm actually working on the import now for this. If the conflict is only with the lockfiles, I'll take care of it. Thanks @keith |
|
ok, thanks! |
github-actions
bot
removed
the
awaiting-PR-merge
|
@bazel-io flag |
bazel-io
added
the
potential release blocker
|
@bazel-io fork 7.2.0 |
bazel-io
removed
the
potential release blocker
bazel-io
pushed a commit
to bazel-io/bazel
that referenced
this pull request
May 28, 2024
There were 2 things with the previous implementation that needed to be improved here: 1. Apple Clang has a bug where it doesn't pass module compiler flags to the underlying -cc1 invocation, so we have to manually pass them directly to that invocation with -Xclang 2. The previous search script was too aggressive and slow for macOS. The macOS SDK has tons of files that aren't headers, and tons of symlinks pointing to other files within the SDK. This adds a fork in the script to run a version that works with Apple SDKs. The time difference on my machine is 41s->6s. 6s is still pretty long so if desired we can put this behavior behind an env var for users to opt in with. I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths. Closes bazelbuild#22259. This reverts commit 1f1b4fd. Closes bazelbuild#22475. PiperOrigin-RevId: 637969838 Change-Id: I7d4940a820e3741836239493222ba8d06c4d70e4
bazel-io
pushed a commit
to bazel-io/bazel
that referenced
this pull request
May 28, 2024
There were 2 things with the previous implementation that needed to be improved here: 1. Apple Clang has a bug where it doesn't pass module compiler flags to the underlying -cc1 invocation, so we have to manually pass them directly to that invocation with -Xclang 2. The previous search script was too aggressive and slow for macOS. The macOS SDK has tons of files that aren't headers, and tons of symlinks pointing to other files within the SDK. This adds a fork in the script to run a version that works with Apple SDKs. The time difference on my machine is 41s->6s. 6s is still pretty long so if desired we can put this behavior behind an env var for users to opt in with. I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths. Closes bazelbuild#22259. This reverts commit 1f1b4fd. Partial commit for third_party/*, see bazelbuild#22475. Change-Id: I801121e36de1504c17adfa4736c49c88d470fec0 Signed-off-by: Hee Cha <heec@google.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 28, 2024
There were 2 things with the previous implementation that needed to be improved here: 1. Apple Clang has a bug where it doesn't pass module compiler flags to the underlying -cc1 invocation, so we have to manually pass them directly to that invocation with -Xclang 2. The previous search script was too aggressive and slow for macOS. The macOS SDK has tons of files that aren't headers, and tons of symlinks pointing to other files within the SDK. This adds a fork in the script to run a version that works with Apple SDKs. The time difference on my machine is 41s->6s. 6s is still pretty long so if desired we can put this behavior behind an env var for users to opt in with. I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths. Closes #22259. This reverts commit 1f1b4fd. Partial commit for third_party/*, see #22475. Change-Id: I801121e36de1504c17adfa4736c49c88d470fec0 Signed-off-by: Hee Cha <heec@google.com> Commit de0a37c Signed-off-by: Hee Cha <heec@google.com> Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
iancha1992
pushed a commit
to bazel-io/bazel
that referenced
this pull request
May 28, 2024
There were 2 things with the previous implementation that needed to be improved here: 1. Apple Clang has a bug where it doesn't pass module compiler flags to the underlying -cc1 invocation, so we have to manually pass them directly to that invocation with -Xclang 2. The previous search script was too aggressive and slow for macOS. The macOS SDK has tons of files that aren't headers, and tons of symlinks pointing to other files within the SDK. This adds a fork in the script to run a version that works with Apple SDKs. The time difference on my machine is 41s->6s. 6s is still pretty long so if desired we can put this behavior behind an env var for users to opt in with. I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths. Closes bazelbuild#22259. This reverts commit 1f1b4fd. Closes bazelbuild#22475. PiperOrigin-RevId: 637969838 Change-Id: I7d4940a820e3741836239493222ba8d06c4d70e4
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 28, 2024
There were 2 things with the previous implementation that needed to be improved here: 1. Apple Clang has a bug where it doesn't pass module compiler flags to the underlying -cc1 invocation, so we have to manually pass them directly to that invocation with -Xclang 2. The previous search script was too aggressive and slow for macOS. The macOS SDK has tons of files that aren't headers, and tons of symlinks pointing to other files within the SDK. This adds a fork in the script to run a version that works with Apple SDKs. The time difference on my machine is 41s->6s. 6s is still pretty long so if desired we can put this behavior behind an env var for users to opt in with. I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths. Closes #22259. This reverts commit 1f1b4fd. Closes #22475. PiperOrigin-RevId: 637969838 Change-Id: I7d4940a820e3741836239493222ba8d06c4d70e4 Commit 6abdd2a Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There were 2 things with the previous implementation that needed to be improved here:
I've added a hermetic version of this to the apple_support toolchain, but similar to the Linux setup here the modulemap file includes absolute paths.
Closes #22259.
This reverts commit 1f1b4fd.