diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 80bb31e1b4c..ba53ed0742b 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -3,7 +3,7 @@ _majorver=7.2
 
 pkgname=gcc
 version=${_majorver}.0
-revision=1
+revision=2
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gcc.gnu.org"
@@ -82,9 +82,10 @@ pre_configure() {
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure
 
 	if [ -n "$nopie" ]; then
-		# Fix configure failures by adding -no-pie when linking conftest.c files
+		# Fix configure failures by adding -no-pie when linking conftest.c/.cpp files
 		find -name configure -exec sed -i {} \
 			-e 's;$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS;& -no-pie;' \
+			-e 's;$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS;& -no-pie;' \
 			\;
 		# Fix linking error for fixincl by adding -no-pie
 		sed -i fixincludes/Makefile.in \
@@ -403,7 +404,6 @@ libcilkrts-devel_package() {
 	short_desc+=" - Intel(R) Cilk(TM) Plus runtime library - development files"
 	pkg_install() {
 		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/cilk
-		vmove "usr/lib/gcc/${_triplet}/${_majorver}/plugin/include/cilk*"
 		vmove usr/lib/libcilkrts.so
 		vmove usr/lib/libcilkrts.a
 		vmove usr/lib/libcilkrts.spec