From: YunQiang Su <yunqiang.su@cipunited.com>
Date: Fri, 6 Jan 2023 10:15:28 +0000 (+0800)
Subject: Set CROSS_SYSTEM_HEADER_DIR according includedir
X-Git-Tag: basepoints/gcc-14~1717
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59e4c98173a79fcaa2c33253261409f38856c384;p=thirdparty%2Fgcc.git

Set CROSS_SYSTEM_HEADER_DIR according includedir

For cross building with option:
   --sysroot=/ --prefix=/usr --includedir=/usr/<triple>
just like Debian does, fixinc.sh will use the wrong header files
from /usr/include.

gcc/
	* Makefile.in (CROSS_SYSTEM_HEADER_DIR): set according the
	value of includedir.
---

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6aed2cda3caf..6001c9e3b559 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -532,7 +532,11 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h
 # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
 NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@
 # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
-CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+ifeq (@includedir@,$(prefix)/include)
+  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+else
+  CROSS_SYSTEM_HEADER_DIR = @includedir@
+endif
 
 # autoconf sets SYSTEM_HEADER_DIR to one of the above.
 # Purge it of unnecessary internal relative paths