From: Daniel Campbell <zlg@gentoo.org>
Date: Fri, 23 Jun 2017 19:38:09 +0000 (-0700)
Subject: dev-util/astyle: Respect CXX wrt bug 622068
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=afde8cea96633a7b9a9c95fa444b7277f04ab11b;p=gentoo.git

dev-util/astyle: Respect CXX wrt bug 622068

Thanks to mgorny for finding the issue.

Gentoo-Bug: 622068
Gentoo-Bug-URL: https://bugs.gentoo.org/622068
Package-Manager: Portage-2.3.6, Repoman-2.3.2
---

diff --git a/dev-util/astyle/astyle-3.0.1.ebuild b/dev-util/astyle/astyle-3.0.1.ebuild
index e32b6189e887..91f94429fc53 100644
--- a/dev-util/astyle/astyle-3.0.1.ebuild
+++ b/dev-util/astyle/astyle-3.0.1.ebuild
@@ -38,7 +38,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake -f ../build/gcc/Makefile -C src \
+	# ../build/clang/Makefile is identical except for CXX line.
+	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
 		${PN} \
 		shared \
 		$(usev java) \
diff --git a/dev-util/astyle/astyle-3.0.ebuild b/dev-util/astyle/astyle-3.0.ebuild
index 4392d25b3dfd..85544bdc8bb1 100644
--- a/dev-util/astyle/astyle-3.0.ebuild
+++ b/dev-util/astyle/astyle-3.0.ebuild
@@ -38,7 +38,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake -f ../build/gcc/Makefile -C src \
+	# ../build/clang/Makefile is identical except for CXX line.
+	emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \
 		${PN} \
 		shared \
 		$(usev java) \