diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index c94fa277475..610074c3153 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* plugin/configfrag.ac: Don't configure for offloading target if
+	we don't build the corresponding plugin.
+	* configure: Regenerate.
+
 2016-02-01  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* testsuite/libgomp.oacc-c-c++-common/loop-dim-default.c: New.
diff --git a/libgomp/configure b/libgomp/configure
index 1410bc71223..d34a350e048 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -15323,6 +15323,7 @@ if test x"$enable_offload_targets" != x; then
   for tgt in `echo $enable_offload_targets | sed -e 's#,# #g'`; do
     tgt_dir=`echo $tgt | grep '=' | sed 's/.*=//'`
     tgt=`echo $tgt | sed 's/=.*//'`
+    tgt_name=
     case $tgt in
       *-intelmic-* | *-intelmicemul-*)
 	tgt_name=intelmic
@@ -15424,7 +15425,11 @@ rm -f core conftest.err conftest.$ac_objext \
 	as_fn_error "unknown offload target specified" "$LINENO" 5
 	;;
     esac
-    if test x"$offload_targets" = x; then
+    if test x"$tgt_name" = x; then
+      # Don't configure libgomp for this offloading target if we don't build
+      # the corresponding plugin.
+      continue
+    elif test x"$offload_targets" = x; then
       offload_targets=$tgt_name
     else
       offload_targets=$offload_targets,$tgt_name
diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 2a9d9f907e3..01815d41c8b 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -146,6 +146,7 @@ if test x"$enable_offload_targets" != x; then
   for tgt in `echo $enable_offload_targets | sed -e 's#,# #g'`; do
     tgt_dir=`echo $tgt | grep '=' | sed 's/.*=//'`
     tgt=`echo $tgt | sed 's/=.*//'`
+    tgt_name=
     case $tgt in
       *-intelmic-* | *-intelmicemul-*)
 	tgt_name=intelmic
@@ -225,7 +226,11 @@ if test x"$enable_offload_targets" != x; then
 	AC_MSG_ERROR([unknown offload target specified])
 	;;
     esac
-    if test x"$offload_targets" = x; then
+    if test x"$tgt_name" = x; then
+      # Don't configure libgomp for this offloading target if we don't build
+      # the corresponding plugin.
+      continue
+    elif test x"$offload_targets" = x; then
       offload_targets=$tgt_name
     else
       offload_targets=$offload_targets,$tgt_name