public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: YunQiang Su <syq@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5490] Set CROSS_SYSTEM_HEADER_DIR according includedir Date: Mon, 30 Jan 2023 09:16:20 +0000 (GMT) [thread overview] Message-ID: <20230130091620.E22FC3858D32@sourceware.org> (raw) https://gcc.gnu.org/g:59e4c98173a79fcaa2c33253261409f38856c384 commit r13-5490-g59e4c98173a79fcaa2c33253261409f38856c384 Author: YunQiang Su <yunqiang.su@cipunited.com> 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/<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: --- 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
reply other threads:[~2023-01-30 9:16 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230130091620.E22FC3858D32@sourceware.org \ --to=syq@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).