fixup! fixup! [Clang][Driver] Fix the missing Target-Triple-Level include path resolution in Baremetal Driver

simpal01 · simpal01 · commit df9dab24aa7f · 2025-12-03T16:20:43.000Z
diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp
@@ -421,7 +421,7 @@ void BareMetal::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
       llvm::sys::path::append(Dir, "include");
       addSystemInclude(DriverArgs, CC1Args, Dir.str());
     }
-    SmallString<128> Dir = SysRootDir;
+    SmallString<128> Dir(SysRootDir);
     llvm::sys::path::append(Dir, getTripleString());
     if (D.getVFS().exists(Dir)) {
       llvm::sys::path::append(Dir, "include");

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ void BareMetal::AddClangSystemIncludeArgs(const ArgList &DriverArgs,`
`421`	`421`	`llvm::sys::path::append(Dir, "include");`
`422`	`422`	`addSystemInclude(DriverArgs, CC1Args, Dir.str());`
`423`	`423`	`}`
`424`		`- SmallString<128> Dir = SysRootDir;`
	`424`	`+ SmallString<128> Dir(SysRootDir);`
`425`	`425`	`llvm::sys::path::append(Dir, getTripleString());`
`426`	`426`	`if (D.getVFS().exists(Dir)) {`
`427`	`427`	`llvm::sys::path::append(Dir, "include");`