From 8b001f38cc713190642194b55e02a56346f51494 Mon Sep 17 00:00:00 2001
From: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
Date: Fri, 12 Apr 2024 12:18:24 +0200
Subject: [PATCH] Fix CROSS_SYSTEM_HEADER_DIR value for Guix.

* gcc/Makefile.in (CROSS_SYSTEM_HEADER_DIR): Always use default value.
---
 gcc/Makefile.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 775aaa1b3c4..06d192fa9ed 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -532,11 +532,7 @@ 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.
-ifeq (@includedir@,$(prefix)/include)
-  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
-else
-  CROSS_SYSTEM_HEADER_DIR = @includedir@
-endif
+CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
 
 # autoconf sets SYSTEM_HEADER_DIR to one of the above.
 # Purge it of unnecessary internal relative paths

base-commit: c891d8dc23e1a46ad9f3e757d09e57b500d40044
-- 
2.41.0

 class='active' href='/guix/log/gnu/packages/erlang.scm'>log</a><a href='/guix/tree/gnu/packages/erlang.scm?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'>tree</a><a href='/guix/commit/gnu/packages/erlang.scm?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'>commit</a><a href='/guix/diff/gnu/packages/erlang.scm?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/erlang.scm'>
<input type='hidden' name='id' value='97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'>root</a>/<a href='/guix/log/gnu?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'>gnu</a>/<a href='/guix/log/gnu/packages?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'>packages</a>/<a href='/guix/log/gnu/packages/erlang.scm?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5'>erlang.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/erlang.scm?id=97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-19 21:40:03 +0200'>2021-01-19</span></td><td><a href='/guix/commit/gnu/packages/erlang.scm?id=aa8df16bc5ca99615188b4f1e94a0e13c1e51d3a'>gnu: erlang: Update to 23.2.1.</a><span class='msg-avail'>...</span></td><td>Oskar Köök</td></tr>
<tr><td><span title='2020-07-12 23:08:15 +0200'>2020-07-12</span></td><td><a href='/guix/commit/gnu/packages/erlang.scm?id=b0e7b6992f3f845e83cfbca4d700b51dba50b4d5'>gnu: Remove ".git" from "https://github/…/….git".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-13 09:30:26 +0300'>2020-05-13</span></td><td><a href='/guix/commit/gnu/packages/erlang.scm?id=3c986a7dc268756c097212de958f046b29b76c1b'>mailmap: Update entries for Nikita.</a><span class='msg-avail'>...</span></td><td>nikita</td></tr>
<tr><td><span title='2020-03-03 14:08:25 +0200'>2020-03-03</span></td><td><a href='/guix/commit/gnu/packages/erlang.scm?id=8c8eb0798523221c060f6c398b769c1c65061245'>gnu: erlang: Update to 21.3.8.13</a><span class='msg-avail'>...</span></td><td>Lars-Dominik Braun</td></tr>
<tr><td><span title='2019-11-19 13:07:06 +0900'>2019-11-19</span></td><td><a href='/guix/commit/gnu/packages/erlang.scm?id=ffb23165488c67d8034146ff8a10d86e238d60f6'>gnu: emacs-erlang: Rename the set-emacs-load-path phase.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>