Skip to content

non_apple_gcc_version: Use preferred_gcc#10587

Merged
sjackman merged 1 commit intoHomebrew:masterfrom
sjackman:sj/preferred-gcc
Feb 11, 2021
Merged

non_apple_gcc_version: Use preferred_gcc#10587
sjackman merged 1 commit intoHomebrew:masterfrom
sjackman:sj/preferred-gcc

Conversation

@sjackman
Copy link
Copy Markdown
Contributor

@sjackman sjackman commented Feb 10, 2021 •
edited
Loading

Check HOMEBREW_PREFIX/opt/#{CompilerSelector.preferred_gcc}/bin/
rather than HOMEBREW_PREFIX/opt/gcc/bin/

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew style with your changes locally?
  • Have you successfully run brew typecheck with your changes locally?
  • Have you successfully run brew tests with your changes locally?
  • Have you successfully run brew man locally and committed any changes?

@sjackman
non_apple_gcc_version: Use preferred_gcc
e615dc4 
Check HOMEBREW_PREFIX/"opt/#{CompilerSelector.preferred_gcc}/bin/
@sjackman sjackman added the bug label Feb 10, 2021
@sjackman sjackman self-assigned this Feb 10, 2021
@BrewTestBot
Copy link
Copy Markdown
Contributor

BrewTestBot commented Feb 10, 2021

Review period will end on 2021-02-11 at 17:15:41 UTC.

@BrewTestBot BrewTestBot added waiting for feedback Merging is blocked until sufficient time has passed for review labels Feb 10, 2021
@Homebrew Homebrew deleted a comment from BrewTestBot Feb 10, 2021
sjackman
sjackman commented Feb 10, 2021
View reviewed changes
Library/Homebrew/development_tools.rb
def non_apple_gcc_version(cc)
(@non_apple_gcc_version ||= {}).fetch(cc) do
path = HOMEBREW_PREFIX/"opt/gcc/bin"/cc
path = HOMEBREW_PREFIX/"opt/#{CompilerSelector.preferred_gcc}/bin"/cc
Copy link
Copy Markdown
Contributor Author

@sjackman sjackman Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line was originally added in Homebrew 0.9.8, seven years ago!
55d277c#diff-b5752027e688b330ed260dd944dbf2674c98c1b44355282d93ead10f89dbc3fdR171

@sjackman sjackman enabled auto-merge February 10, 2021 21:05
@BrewTestBot BrewTestBot removed the waiting for feedback Merging is blocked until sufficient time has passed for review label Feb 11, 2021
@BrewTestBot
Copy link
Copy Markdown
Contributor

BrewTestBot commented Feb 11, 2021

Review period ended.

@sjackman sjackman merged commit 27dd1b6 into Homebrew:master Feb 11, 2021
@sjackman sjackman deleted the sj/preferred-gcc branch February 12, 2021 20:20
@BrewTestBot BrewTestBot added the outdated PR was locked due to age label Mar 15, 2021
@Homebrew Homebrew locked as resolved and limited conversation to collaborators Mar 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@MikeMcQuaid MikeMcQuaid MikeMcQuaid approved these changes

@BrewTestBot BrewTestBot BrewTestBot approved these changes

@iMichka iMichka iMichka approved these changes

Assignees

@sjackman sjackman

Labels

outdated PR was locked due to age

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sjackman @BrewTestBot @MikeMcQuaid @iMichka