diff --git a/PKGBUILD b/PKGBUILD
index 7ade66a4ae682..f3b86330cf002 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -134,10 +134,10 @@ build() {
   # LTO needs more open files
   ulimit -n 4096
 
-  # -fno-plt with cross-LTO causes obscure LLVM errors
-  # LLVM ERROR: Function Import: link error
-  #CFLAGS="${CFLAGS/-fno-plt/}"
-  #CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+  # march cannot be tuned, otherwise clang segfaults
+  CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+  CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+  LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 
   xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
   ./mach buildsymbols