From 5a37722b066f5792aad80fb5b32fb3c056cf1607 Mon Sep 17 00:00:00 2001
From: Kinsey Moore <kinsey.moore@oarcorp.com>
Date: Tue, 25 Oct 2022 14:03:10 -0500
Subject: [PATCH] spec/pkgconfig: Allow builds to override headers

This allows any builds targeting an installed RTEMS BSP to override
headers in the installed BSP reliably, including headers previously
installed by that or other builds. This includes applications, network
stacks, libraries, and any other builds.

Closes #4896
---
 spec/build/bsps/makecustom.yml | 2 +-
 spec/build/bsps/pkgconfig.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/build/bsps/makecustom.yml b/spec/build/bsps/makecustom.yml
index 139629b597..9f5f2f2e59 100644
--- a/spec/build/bsps/makecustom.yml
+++ b/spec/build/bsps/makecustom.yml
@@ -2,7 +2,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: config-file
 content: |
   include $$(RTEMS_ROOT)/make/custom/default.cfg
-  CPU_DEFINES = -I$$(exec_prefix)/$$(RTEMS_BSP)/lib/include
+  CPU_DEFINES = -isystem$$(exec_prefix)/$$(RTEMS_BSP)/lib/include
   CPU_CFLAGS = ${ABI_FLAGS}
   CFLAGS_OPTIMIZE_V = ${OPTIMIZATION_FLAGS}
   LDFLAGS = -B$$(exec_prefix)/$$(RTEMS_BSP)/lib ${PKGCONFIG_LDFLAGS}
diff --git a/spec/build/bsps/pkgconfig.yml b/spec/build/bsps/pkgconfig.yml
index a9462fcc95..8a3c3677a4 100644
--- a/spec/build/bsps/pkgconfig.yml
+++ b/spec/build/bsps/pkgconfig.yml
@@ -22,7 +22,7 @@ content: |
   Name: ${ARCH}-rtems${__RTEMS_MAJOR__}-${BSP_NAME}
   Version: ${RTEMS_VERSION}
   Description: RTEMS BSP ${ARCH}/${BSP_NAME}
-  Cflags: $${ABI_FLAGS} -I$${includedir}
+  Cflags: $${ABI_FLAGS} -isystem$${includedir}
   Ldflags: -B$${libdir} ${PKGCONFIG_LDFLAGS}
   Libs: -B$${libdir} ${PKGCONFIG_LDFLAGS}
 copyrights: