From: Tupone Alfredo <tupone@gentoo.org>
Date: Wed, 18 Sep 2019 09:18:07 +0000 (+0200)
Subject: dev-ada/gprbuild: use wrapper for gcc and gnatmake
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=709682396918812d6983fd73740adf30c89be136;p=gentoo.git

dev-ada/gprbuild: use wrapper for gcc and gnatmake

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---

diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
index 4f38907463ff..dc6766583911 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
@@ -66,13 +66,13 @@ src_compile() {
 	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
 		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
 		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
 	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+		gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
 			-o ${bin} -largs gpr_imports.o || die
 	done
 	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+		gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
 			-largs gpr_imports.o || die
 	done
 }
diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild
index 025a4ab8e393..f5ef22a54424 100644
--- a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild
@@ -57,13 +57,13 @@ src_compile() {
 	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
 		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
 		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
 	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+		gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
 			-o ${bin} -largs gpr_imports.o || die
 	done
 	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+		gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
 			-largs gpr_imports.o || die
 	done
 }