diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 031674e86d..acaecdb4bb 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -30,9 +30,10 @@ $SCRIPTS/build pixman
 $SCRIPTS/build fontsproto
 $SCRIPTS/build udev
 
-# Suffers from bug 42453 <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42453>.
-  CFLAGS=`echo $CFLAGS | sed -e "s|-fuse-linker-plugin||"`
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"`
+# Fails to compile with GCC's link time optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
 
 if [ "$XINERAMA_SUPPORT" = "yes" ]; then
   $SCRIPTS/build libXinerama