Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR cleans up legacy macOS superenv shims/cccfg behavior and refactors macOS ENV configuration to remove obsolete flags and tighten API surface.
Changes:
- Remove the
apr-1-configshim and the associatedacccfg flag. - Make
-oso_prefixbehavior unconditional (subject to existing configure/debug-symbol guards) and replace theantshim to avoid relying on/usr/bin/ant. - Move macOS superenv cccfg setup into
determine_cccfg, and makeENV.*_support?helpers private; add deprecation notes for macOS-specific ENV APIs.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| Library/Homebrew/shims/super/cc | Makes -oso_prefix application independent of the o cccfg flag. |
| Library/Homebrew/shims/mac/super/apr-1-config | Removes the legacy apr-1-config shim entirely. |
| Library/Homebrew/shims/mac/super/ant | Updates shim to exec only non-system ant binaries via shared shim utilities. |
| Library/Homebrew/extend/os/mac/extend/ENV/super.rb | Refactors cccfg determination and broadens Sonoma iconv configure workaround. |
| Library/Homebrew/extend/os/mac/extend/ENV/std.rb | Adds notes about deprecating macOS-specific ENV helpers in stdenv. |
| Library/Homebrew/extend/os/mac/extend/ENV/shared.rb | Makes *_support? helper methods private. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
carlocab
approved these changes
Mar 23, 2026
MikeMcQuaid
approved these changes
Mar 23, 2026
Member
MikeMcQuaid
left a comment
There was a problem hiding this comment.
Lovely cleanup, thanks @Bo98!
This file contains hidden or 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
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.
apr-1-configshim. It was for systemapr-1-configand that was removed from I think macOS 10.12.acccfg that was forapr-1-config.antshim with one that only tries non-system executables as/usr/bin/antwas removed in OS X 10.9. Maybe we can remove it entirely or move it to be cross-OS but I took the cautious approach in this PR.occcfg as it is now unconditionally set on macOS and we only read it inldflags_macin the shim anyway. The effect it activated remains always activated on macOS.append_to_cccfgtodetermine_cccfgto be more consistent and a bit clearerENV.no_fixup_chainsENV.no_weak_importsENV.[...]_support?methods to be private. Hopefully nothing used these as I don't think they were intended to be public API?