Do not setup additional include steps for toolchain

Author: mdtoguchi

clang/lib/Driver/ToolChains/MinGW.cpp

@@ -491,7 +491,7 @@ static bool looksLikeMinGWSysroot(const std::string &Directory) {
 toolchains::MinGW::MinGW(const Driver &D, const llvm::Triple &Triple,
                          const ArgList &Args)
     : ToolChain(D, Triple, Args), CudaInstallation(D, Triple, Args),
-      RocmInstallation(D, Triple, Args), SYCLInstallation(D, Triple, Args) {
+      RocmInstallation(D, Triple, Args) {
   getProgramPaths().push_back(getDriver().Dir);
 
   std::string InstallBase =
@@ -630,11 +630,6 @@ void toolchains::MinGW::AddHIPIncludeArgs(const ArgList &DriverArgs,
   RocmInstallation->AddHIPIncludeArgs(DriverArgs, CC1Args);
 }
 
-void toolchains::MinGW::addSYCLIncludeArgs(const ArgList &DriverArgs,
-                                           ArgStringList &CC1Args) const {
-  SYCLInstallation->addSYCLIncludeArgs(DriverArgs, CC1Args);
-}
-
 void toolchains::MinGW::printVerboseInfo(raw_ostream &OS) const {
   CudaInstallation->print(OS);
   RocmInstallation->print(OS);

clang/lib/Driver/ToolChains/MinGW.h

@@ -13,7 +13,6 @@
 #include "Gnu.h"
 #include "LazyDetector.h"
 #include "ROCm.h"
-#include "SYCL.h"
 #include "clang/Driver/Tool.h"
 #include "clang/Driver/ToolChain.h"
 #include "llvm/Support/ErrorOr.h"
@@ -93,8 +92,6 @@ class LLVM_LIBRARY_VISIBILITY MinGW : public ToolChain {
                           llvm::opt::ArgStringList &CC1Args) const override;
   void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs,
                          llvm::opt::ArgStringList &CC1Args) const override;
-  void addSYCLIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-                          llvm::opt::ArgStringList &CC1Args) const override;
 
   void printVerboseInfo(raw_ostream &OS) const override;
 
@@ -108,7 +105,6 @@ class LLVM_LIBRARY_VISIBILITY MinGW : public ToolChain {
 private:
   LazyDetector<CudaInstallationDetector> CudaInstallation;
   LazyDetector<RocmInstallationDetector> RocmInstallation;
-  LazyDetector<SYCLInstallationDetector> SYCLInstallation;
 
   std::string Base;
   std::string GccLibDir;