diff --git a/e17/evas/evas.conf b/e17/evas/evas.conf
index 3d98524c8..74d645f0d 100644
--- a/e17/evas/evas.conf
+++ b/e17/evas/evas.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../evas/evas.conf
-# Copyright (C) 2006 - 2011 The OpenSDE Project
+# Copyright (C) 2006 - 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2004 Clifford Wolf
 #
@@ -43,6 +43,7 @@ if pkginstalled directfb ; then
 	var_append confopt " " "--enable-directfb"
 fi
 
+if ! atstage toolchain; then
 # check for xorg
 if pkginstalled xorg-server ; then
 	var_append confopt " " "--x-includes=$( pkgprefix -r includedir xorg-server )"
@@ -58,8 +59,9 @@ if pkginstalled cairo ; then
 	var_append confopt ' ' "--enable-cairo-x11"
 	var_append GCC_WRAPPER_APPEND ' ' "`pkg-config cairo --cflags`"
 fi
+fi
 
-if pkginstalled fontconfig ; then
+if ! atstage toolchain && pkginstalled fontconfig ; then
 	pkgprefix -t fontconfig
 	var_append confopt ' ' "--enable-fontconfig"
 	var_append GCC_WRAPPER_APPEND ' ' "`pkg-config fontconfig --cflags`"