From 7cd780c1cbf8cf20cc8cc4df830c87013541e541 Mon Sep 17 00:00:00 2001
From: victzhan <victzhan@amd.com>
Date: Tue, 14 Jan 2025 15:59:21 -0500
Subject: [PATCH] SWDEV-485042 - Remove -I option passed into comgr when file
 type is not FILE_TYPE_ASM_TEXT

Change-Id: If8e469f881651f7b3dae364e8182ef1ba6f3a0d1


[ROCm/clr commit: ca35d9367238dbf8f6966785cbaefc2e0852b566]
---
 projects/clr/rocclr/device/devprogram.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/projects/clr/rocclr/device/devprogram.cpp b/projects/clr/rocclr/device/devprogram.cpp
index 0fdaccc8bd..b3b8f844da 100644
--- a/projects/clr/rocclr/device/devprogram.cpp
+++ b/projects/clr/rocclr/device/devprogram.cpp
@@ -1227,8 +1227,20 @@ bool Program::linkImplLC(amd::option::Options* options) {
   codegenOptions.push_back(optLevel.str());
 
   // Pass clang options
-  codegenOptions.insert(codegenOptions.end(),
-      options->clangOptions.begin(), options->clangOptions.end());
+  if (continueCompileFrom != FILE_TYPE_ASM_TEXT) {
+    std::copy_if(
+      options->clangOptions.begin(),
+      options->clangOptions.end(),
+      std::back_inserter(codegenOptions),
+      [](const std::string& opt) {
+        return opt.rfind("-I", 0) != 0;
+      }
+    );
+  } else {
+    codegenOptions.insert(codegenOptions.end(),
+                          options->clangOptions.begin(),
+                          options->clangOptions.end());
+  }
 
   // Temporarily disable problematic pass for some Adobe apps.
   {