[openacc, testsuite] Allow installed testing of libgomp to find gomp-constants.h

2018-05-07  Tom de Vries  <tom@codesourcery.com>

	PR testsuite/85677
	* testsuite/lib/libgomp.exp (libgomp_init): Move inclusion of top-level
	include directory in ALWAYS_CFLAGS out of $blddir != "" condition.

From-SVN: r259992

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index b2f8c45c8646486d63b7430de2fb7793846f3d5c..74a3842af40753171e3b2bee362ba5e58c350c05 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-07  Tom de Vries  <tom@codesourcery.com>
+
+       PR testsuite/85677
+       * testsuite/lib/libgomp.exp (libgomp_init): Move inclusion of top-level
+       include directory in ALWAYS_CFLAGS out of $blddir != "" condition.
+
 2018-05-03  Tom de Vries  <tom@codesourcery.com>
 
        PR testsuite/85106

diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 8ac24463be6a66f53a97fcb8854dde290bad71ae..c41b3e6dc18f662208f76333c68b47987a37b1ee 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -187,9 +187,9 @@ proc libgomp_init { args } {
         lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs"
         lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}"
         lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs"
-       # The top-level include directory, for gomp-constants.h.
-       lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/../../include"
     }
+    # The top-level include directory, for gomp-constants.h.
+    lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/../../include"
     lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.."
 
     # For build-tree testing, also consider the library paths used for builing.