diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index c34b0d3554..d262776684 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -2,9 +2,11 @@
 
 . config/options $1
 
+strip_lto  # Fails to compile with GCC's link time optimization.
+strip_gold # Fails to compile using the gold linker.
+
 # Filter out some problematic CFLAGS
-  CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||"`
-  CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O2|"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||" -e "s|-O?||"`
 
 # set some CFLAGS we need
   CFLAGS="$CFLAGS -g -fno-stack-protector"
diff --git a/packages/toolchain/devel/eglibc/meta b/packages/toolchain/devel/eglibc/meta
index f271846cd2..a60996000b 100644
--- a/packages/toolchain/devel/eglibc/meta
+++ b/packages/toolchain/devel/eglibc/meta
@@ -13,3 +13,4 @@ PKG_SHORTDESC="eglibc: The Embedded GNU C library"
 PKG_LONGDESC="The Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) that is designed to work well on embedded systems. EGLIBC strives to be source and binary compatible with GLIBC. EGLIBC's goals include reduced footprint, configurable components, better support for cross-compilation and cross-testing. In contrast to what Ulrich Drepper makes out of GLIBC, in EGLIBC all patches assigned to the FSF will be considered regardless of individual or company affiliation and cooperation is encouraged, as well as communication, civility, and respect among developers."
 PKG_IS_ADDON="no"
 
+PKG_AUTORECONF="no"