libgomp: Don't configure for offloading target if we don't build the corresponding plugin

libgomp/
	* plugin/configfrag.ac: Don't configure for offloading target if
	we don't build the corresponding plugin.
	* configure: Regenerate.

From-SVN: r233070
This commit is contained in:
Thomas Schwinge 2016-02-02 13:48:04 +01:00 committed by Thomas Schwinge
parent 9dc03c974f
commit 41d809d3c8
3 changed files with 18 additions and 2 deletions

View File

@ -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.

7
libgomp/configure vendored
View File

@ -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

View File

@ -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