From 37d6c719c4a65b0989928f42fdb1db7df8bfe0d9 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 7 May 2018 11:33:45 +0000 Subject: [PATCH] [openacc, testsuite] Allow installed testing of libgomp to find gomp-constants.h 2018-05-07 Tom de Vries 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 --- libgomp/ChangeLog | 6 ++++++ libgomp/testsuite/lib/libgomp.exp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index b2f8c45c864..74a3842af40 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2018-05-07 Tom de Vries + + 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 PR testsuite/85106 diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 8ac24463be6..c41b3e6dc18 100644 --- 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. -- 2.30.2