From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7863) id E22FC3858D32; Mon, 30 Jan 2023 09:16:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E22FC3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675070180; bh=3QPUDPOIhqg88FyW7JMo8lk80LxYgHkYNm25871/rWU=; h=From:To:Subject:Date:From; b=ezWL+t7VjAg0jG9uO4wDX3Z9mBMjN15k33KgoZTNq3YASp6EaK2TouIncc50jp6jW k7xJ8Ldlo6Kc6v5tkGAZvPBIrnCM4eFz9sNrK3BmiWpOAh/cYi0BvqOUEuS7Yeypdv L47J0dQoQcNHkPkNPUG5bEwFtyGaWE2rRCqquA5k= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: YunQiang Su To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5490] Set CROSS_SYSTEM_HEADER_DIR according includedir X-Act-Checkin: gcc X-Git-Author: YunQiang Su X-Git-Refname: refs/heads/master X-Git-Oldrev: 4c17371dc5a1193671e5a475349fa7d7a6f0ca1c X-Git-Newrev: 59e4c98173a79fcaa2c33253261409f38856c384 Message-Id: <20230130091620.E22FC3858D32@sourceware.org> Date: Mon, 30 Jan 2023 09:16:20 +0000 (GMT) List-Id: https://gcc.gnu.org/g:59e4c98173a79fcaa2c33253261409f38856c384 commit r13-5490-g59e4c98173a79fcaa2c33253261409f38856c384 Author: YunQiang Su Date: Fri Jan 6 18:15:28 2023 +0800 Set CROSS_SYSTEM_HEADER_DIR according includedir For cross building with option: --sysroot=/ --prefix=/usr --includedir=/usr/ 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: --- gcc/Makefile.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 6aed2cda3ca..6001c9e3b55 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