[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Fabian Groffen]

commit:     c0220bd1c32e17136dc9efc956da3c276d4e9d2b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 10:11:24 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 10:11:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0220bd1

dev-vcs/git-2.29.2: don't build osxkeychain module with gcc

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-vcs/git/git-2.29.2.ebuild  | 4 ++--
 dev-vcs/git/git-9999-r3.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
index 6e5c5a74a12..ca7a5942fda 100644
--- a/dev-vcs/git/git-2.29.2.ebuild
+++ b/dev-vcs/git/git-2.29.2.ebuild
@@ -341,7 +341,7 @@ src_compile() {
                        || die "emake gitweb (cgi) failed"
        fi
 
-       if [[ ${CHOST} == *-darwin* ]]; then
+       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
                pushd contrib/credential/osxkeychain &>/dev/null || die
                git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
                        || die "emake credential-osxkeychain"
@@ -391,7 +391,7 @@ src_compile() {
 src_install() {
        git_emake install || die "make install failed"
 
-       if [[ ${CHOST} == *-darwin* ]]; then
+       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
                dobin contrib/credential/osxkeychain/git-credential-osxkeychain
        fi
 

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 6e5c5a74a12..ca7a5942fda 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -341,7 +341,7 @@ src_compile() {
                        || die "emake gitweb (cgi) failed"
        fi
 
-       if [[ ${CHOST} == *-darwin* ]]; then
+       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
                pushd contrib/credential/osxkeychain &>/dev/null || die
                git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
                        || die "emake credential-osxkeychain"
@@ -391,7 +391,7 @@ src_compile() {
 src_install() {
        git_emake install || die "make install failed"
 
-       if [[ ${CHOST} == *-darwin* ]]; then
+       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
                dobin contrib/credential/osxkeychain/git-credential-osxkeychain
        fi