diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template
index 9298d5c81e0..3fde590ef43 100644
--- a/srcpkgs/openjdk/template
+++ b/srcpkgs/openjdk/template
@@ -15,7 +15,7 @@ version="${_java_ver}u${_jdk_update}b${_jdk_build}"
 revision=1
 _repo_ver="jdk${version/b/-b}"
 nocross=yes
-wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/
+wrksrc="jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/"
 build_style=gnu-configure
 configure_args="
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -129,27 +129,23 @@ alternatives="
 "
 
 CFLAGS="-Wno-error=deprecated-declarations"
-if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
-	# Append CFLAGS to set work around code which gcc6 would
-	# otherwise regard as out-of-specification and allow it
-	# to produce a working program.
-	CFLAGS+=" -Wno-error -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
-fi
-if [ ${XBPS_GCC_VERSION_MAJOR} -gt 7 ]; then
-	CFLAGS+=" -Wno-deprecated-declarations -Wno-stringop-overflow -Wno-return-type"
-fi
+
+# Append CFLAGS to set work around code which gcc6 would
+# otherwise regard as out-of-specification and allow it
+# to produce a working program.
+CFLAGS+=" -Wno-error -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
+
+CFLAGS+=" -Wno-deprecated-declarations -Wno-stringop-overflow -Wno-return-type"
 
 post_extract() {
-	if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
-		cd ${XBPS_BUILDDIR}/jdk-${_repo_ver}
-		# gcc6 complains about the signed shift left
-		sed -i src/share/native/com/sun/java/util/jar/pack/constants.h \
-			-e's;(-1)<<13;~0u<<13;g'
-		# wrong "return false;" instead of "return null;"
-		sed -i src/share/native/com/sun/java/util/jar/pack/jni.cpp \
-			-e"295s;false;null;"
-		cd ${wrksrc}
-	fi
+	cd ${XBPS_BUILDDIR}/jdk-${_repo_ver}
+	# gcc6 complains about the signed shift left
+	sed -i src/share/native/com/sun/java/util/jar/pack/constants.h \
+		-e's;(-1)<<13;~0u<<13;g'
+	# wrong "return false;" instead of "return null;"
+	sed -i src/share/native/com/sun/java/util/jar/pack/jni.cpp \
+		-e"295s;false;null;"
+	cd ${wrksrc}
 	chmod +x configure
 	for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
 		ln -s ../${subrepo}-${_repo_ver} ${subrepo}