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"});
 }
58511'>tree</a><a href='/guix/commit/?id=f8d3c99ba1f1cd0493e2cbdfdf022d5664958511'>commit</a><a href='/guix/diff/?id=f8d3c99ba1f1cd0493e2cbdfdf022d5664958511'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/'>
<input type='hidden' name='id' value='f8d3c99ba1f1cd0493e2cbdfdf022d5664958511'/><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='content'><div id='summary'><pre>
A big thanks to Eelco Dolstra, who designed and implemented Nix.
Transposing functional programming discipline to package management
proved to be inspiring and fruitful.

Thanks to the following people who contributed to GNU Guix through
suggestions, bug reports, patches, internationalization, or general
infrastructure help:

	    Lluís Batlle i Rossell &lt;viric@viric.name&gt;
          Sylvain Beucler &lt;beuc@beuc.net&gt;
	   Carlos Carleos &lt;carleos@uniovi.es&gt;
	   Felipe Castro &lt;fefcas@gmail.com&gt;
	   Daniel Clark &lt;dclark@pobox.com&gt;
	Alexandru Cojocaru &lt;xojoc@gmx.com&gt;
	    Aleix Conchillo Flaqué &lt;aconchillo@gmail.com&gt;
          Malcolm Cook &lt;MEC@stowers.org&gt;
           Thomas Danckaert &lt;thomas.danckaert@gmail.com&gt;
	   Rafael Ferreira &lt;rafael.f.f1@gmail.com&gt;
	Christian Grothoff &lt;christian@grothoff.org&gt;
             Eric Hanchrow &lt;eric.hanchrow@gmail.com&gt;
           Konrad Hinsen &lt;konrad.hinsen@fastmail.net&gt;
          Brandon Invergo &lt;brandon@gnu.org&gt;
           Anders Jonsson &lt;anders.jonsson@norsjovallen.se&gt;
	  Jeffrin Jose &lt;ahiliation@yahoo.co.in&gt;
	          Kete &lt;kete@ninthfloor.org&gt;
           Daniel Kochmański &lt;dkochmanski@hellsgate.pl&gt;
	  Matthew Lien &lt;bluet@bluet.org&gt;
             Dave Love &lt;fx@gnu.org&gt;
            Chris Marusich &lt;cmmarusich@gmail.com&gt;
            Niels Möller &lt;nisse@lysator.liu.se&gt;
          Cyprien Nicolas &lt;cyprien@nicolas.tf&gt;
	   Yutaka Niibe &lt;gniibe@fsij.org&gt;
           Andrei Osipov &lt;andrspv@gmail.com&gt;
                  Petter &lt;petter@mykolab.ch&gt;
             Adam Pribyl &lt;pribyl@lowlevel.cz&gt;
            Pjotr Prins &lt;pjotr.public12@thebird.nl&gt;
  Yakkala Yagnesh Raghava &lt;hi@yagnesh.org&gt;
           Joshua Randall &lt;jcrandall@alum.mit.edu&gt;
      Bruno Félix Rezende Ribeiro &lt;oitofelix@gnu.org&gt;
	    Benno Schulenberg &lt;coordinator@translationproject.org&gt;
           Thomas Schwinge &lt;thomas@codesourcery.com&gt;
        Alexander Shendi &lt;Alexander.Shendi@web.de&gt;
	     Alen Skondro &lt;askondro@gmail.com&gt;
              Jan Synáček &lt;jan.synacek@gmail.com&gt;
	 Matthias Wachs &lt;wachs@net.in.tum.de&gt;
        Christine Lemmer-Webber &lt;cwebber@dustycloud.org&gt;
           Philip Woods &lt;elzairthesorcerer@gmail.com&gt;

GNU Guix also includes non-software works.  Thanks to the following
people who contributed the logo and general artwork and themes:

           Nikita Karetnikov &lt;nikita@karetnikov.org&gt;
           Felipe López &lt;felipe.lopez@openmailbox.org&gt;
</pre>
</div></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>