From c7ec5c09d10c0eb7e3ce2bea5e219ecd44011281 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Mon, 19 Dec 2016 12:52:17 -0700
Subject: [PATCH] gcc-runtime-external: fix inclusion of {omp,openacc}.h

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 recipes-external/gcc/gcc-runtime-external.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes-external/gcc/gcc-runtime-external.bb b/recipes-external/gcc/gcc-runtime-external.bb
index eba354c..72aef4c 100644
--- a/recipes-external/gcc/gcc-runtime-external.bb
+++ b/recipes-external/gcc/gcc-runtime-external.bb
@@ -19,7 +19,9 @@ target_libdir = "${libdir}"
 HEADERS_MULTILIB_SUFFIX ?= "${@oe.external.run(d, 'gcc', *('${TARGET_CC_ARCH}'.split() + ['-print-sysroot-headers-suffix'])).rstrip()}"
 external_libroot = "${@os.path.realpath('${EXTERNAL_TOOLCHAIN_LIBROOT}').replace(os.path.realpath('${EXTERNAL_TOOLCHAIN}') + '/', '/')}"
 FILES_MIRRORS =. "\
-    ${libdir}/gcc/${TARGET_SYS}/${GCC_VERSION}/|${external_libroot}/\n \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/|${external_libroot}/\n \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/|/lib/gcc/${EXTERNAL_TARGET_SYS}/${BINV}/include/ \n \
+    ${libdir}/gcc/${TARGET_SYS}/|${libdir}/gcc/${EXTERNAL_TARGET_SYS}/\n \
     ${includedir}/c\+\+/${GCC_VERSION}/${TARGET_SYS}/|${includedir}/c++/${GCC_VERSION}/${EXTERNAL_TARGET_SYS}${HEADERS_MULTILIB_SUFFIX}/\n \
     ${includedir}/c\+\+/${GCC_VERSION}/${TARGET_SYS}/|${includedir}/c++/${GCC_VERSION}/${EXTERNAL_TARGET_SYS}/\n \
 "
@@ -49,6 +51,9 @@ FILES_libstdc++-dev = "\
     ${libdir}/libstdc++.la \
     ${libdir}/libsupc++.la \
 "
+FILES_libgomp-dev += "\
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/openacc.h \
+"
 BBCLASSEXTEND = ""
 
 do_package[depends] += "virtual/${MLPREFIX}libc:do_packagedata"