diff --git a/ChangeLog b/ChangeLog
index da2e2ce39d..566ea0dfbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.ac (target_configdirs): Unset if not building gcc.
+	* configure: Regenerated.
+
 2015-01-28  James Bowman  <james.bowman@ftdichip.com>
 
 	* configure.ac: Add FT32 support.
diff --git a/configure b/configure
index d075cf36b9..5caf82b08c 100755
--- a/configure
+++ b/configure
@@ -6614,6 +6614,9 @@ Supported languages are: ${potential_languages}" "$LINENO" 5
 
 
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
+else
+  # Disable all target libraries if not building gcc.
+  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
diff --git a/configure.ac b/configure.ac
index 5ff56bfaa5..34774d85da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2039,6 +2039,9 @@ Supported languages are: ${potential_languages}])
 
   AC_SUBST(stage1_languages)
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
+else
+  # Disable all target libraries if not building gcc.
+  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.