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.

Sign up for GitHub

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

Jump to bottom

gcc@*: fix MacOS usage #191703

Merged
merged 2 commits into from
Sep 24, 2024
Merged

gcc@*: fix MacOS usage #191703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6de7445
gcc@5: fix MacOS usage
MikeMcQuaid Sep 24, 2024
fe1b454
gcc@6: fix MacOS usage
MikeMcQuaid Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Formula/g/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class GccAT5 < Formula
# This should be removed in the next release of GCC if fixed by apple; this is an xcode bug,
# but this patch is a work around committed to GCC trunk
on_macos do
if MacOS::Xcode.version >= "10.2"
if OS::Mac::Xcode.version >= "10.2"
patch do
url "https://raw.githubusercontent.com/Homebrew/formula-patches/91d57ebe88e17255965fa88b53541335ef16f64a/gcc%405/gcc5-xcode10.2.patch"
sha256 "6834bec30c54ab1cae645679e908713102f376ea0fc2ee993b3c19995832fe56"
Expand Down Expand Up @@ -110,7 +110,7 @@ def install
args << "--with-system-zlib"

# System headers may not be in /usr/include
sdk = MacOS.sdk_path_if_needed
sdk = OS::Mac.sdk_path_if_needed
if sdk
args << "--with-native-system-header-dir=/usr/include"
args << "--with-sysroot=#{sdk}"
Expand Down
4 changes: 2 additions & 2 deletions Formula/g/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class GccAT6 < Formula
# This should be removed in the next release of GCC if fixed by apple; this is an xcode bug,
# but this patch is a work around committed to GCC trunk
on_macos do
if MacOS::Xcode.version >= "10.2"
if OS::Mac::Xcode.version >= "10.2"
patch do
url "https://raw.githubusercontent.com/Homebrew/formula-patches/91d57ebe88e17255965fa88b53541335ef16f64a/gcc%406/gcc6-xcode10.2.patch"
sha256 "0f091e8b260bcfa36a537fad76823654be3ee8462512473e0b63ed83ead18085"
Expand Down Expand Up @@ -114,7 +114,7 @@ def install
args << "--disable-multilib" if DevelopmentTools.clang_build_version >= 1000

# System headers may not be in /usr/include
sdk = MacOS.sdk_path_if_needed
sdk = OS::Mac.sdk_path_if_needed
if sdk
args << "--with-native-system-header-dir=/usr/include"
args << "--with-sysroot=#{sdk}"
Expand Down
Loading