Author: Wilfried (justxi) Holzke

Adopted from https://github.com/justxi/rocm/blob/master/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch

Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
===================================================================
--- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -326,11 +326,6 @@ void RocmInstallationDetector::AddHIPInc
     //
     // ROCm 3.5 does not fully support the wrapper headers. Therefore it needs
     // a workaround.
-    SmallString<128> P(D.ResourceDir);
-    if (UsesRuntimeWrapper)
-      llvm::sys::path::append(P, "include", "cuda_wrappers");
-    CC1Args.push_back("-internal-isystem");
-    CC1Args.push_back(DriverArgs.MakeArgString(P));
   }
 
   if (DriverArgs.hasArg(options::OPT_nogpuinc))
@@ -341,8 +336,6 @@ void RocmInstallationDetector::AddHIPInc
     return;
   }
 
-  CC1Args.push_back("-internal-isystem");
-  CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath()));
   if (UsesRuntimeWrapper)
     CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"});
 }
sh'>log</a><a href='/guix/tree/tests/guix-build-branch.sh?id=52c20ceb755842c6ba9c2ec0b8afc7ab699f461e'>tree</a><a href='/guix/commit/tests/guix-build-branch.sh?id=52c20ceb755842c6ba9c2ec0b8afc7ab699f461e'>commit</a><a href='/guix/diff/tests/guix-build-branch.sh?id=52c20ceb755842c6ba9c2ec0b8afc7ab699f461e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-build-branch.sh'>
<input type='hidden' name='id' value='52c20ceb755842c6ba9c2ec0b8afc7ab699f461e'/><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=52c20ceb755842c6ba9c2ec0b8afc7ab699f461e'>root</a>/<a href='/guix/log/tests?id=52c20ceb755842c6ba9c2ec0b8afc7ab699f461e'>tests</a>/<a href='/guix/log/tests/guix-build-branch.sh?id=52c20ceb755842c6ba9c2ec0b8afc7ab699f461e'>guix-build-branch.sh</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/tests/guix-build-branch.sh?id=52c20ceb755842c6ba9c2ec0b8afc7ab699f461e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-04-21 16:16:38 +0200'>2023-04-21</span></td><td><a href='/guix/commit/tests/guix-build-branch.sh?id=37dd69b44511dc73eb04bdebe8d82c9a0386338e'>tests: Fix checks for expected failures.</a><span class='msg-avail'>...<span class='msg-tooltip'>Addresses &lt;https://issues.guix.gnu.org/62406&gt;.

With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately.  Instead use '&amp;&amp; false' to indicate an expected failure.

* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... &amp;&amp; false' or `test ! ...` as appropriate.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2022-10-22 01:46:54 +0200'>2022-10-22</span></td><td><a href='/guix/commit/tests/guix-build-branch.sh?id=fa6566bdc02958823b342b86c7d88853542444ae'>tests: 'guix build --with-commit' output no longer refers to the tag ID.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 46f7011591601b4783b2dc2c7252c41564ca0140.

* tests/guix-build-branch.sh: Replace tag ID by commit ID.
</span></span></td><td>Ludovic Courtès</td></tr>