diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index ebcf217afb..ceca7052e9 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm'
 pkgname=llvm
 version=3.8.1
-revision=1
+revision=2
 wrksrc="llvm-${version}.src"
 lib32disabled=yes
 build_style=cmake
@@ -132,6 +132,10 @@ pre_configure() {
 	configure_args+=" -DLLVM_TARGET_ARCH=${_arch}"
 	configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
 }
+post_configure() {
+	# Don't leak CFLAGS into llvm-config.
+        sed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" tools/llvm-config/BuildVariables.inc
+}
 
 do_install() {
 	vlicense LICENSE.TXT