Do not add header search directories at this time

Author: mdtoguchi

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -26,21 +26,8 @@ void SYCLInstallationDetector::AddSYCLIncludeArgs(
     return;
 
   // Add the SYCL header search locations in the specified order.
-  //   ../include/sycl/stl_wrappers
-  //   ../include
-  SmallString<128> IncludePath(D.Dir);
-  llvm::sys::path::append(IncludePath, "..");
-  llvm::sys::path::append(IncludePath, "include");
-  // This is used to provide our wrappers around STL headers that provide
-  // additional functions/template specializations when the user includes those
-  // STL headers in their programs (e.g., <complex>).
-  SmallString<128> STLWrappersPath(IncludePath);
-  llvm::sys::path::append(STLWrappersPath, "sycl");
-  llvm::sys::path::append(STLWrappersPath, "stl_wrappers");
-  CC1Args.push_back("-internal-isystem");
-  CC1Args.push_back(DriverArgs.MakeArgString(STLWrappersPath));
-  CC1Args.push_back("-internal-isystem");
-  CC1Args.push_back(DriverArgs.MakeArgString(IncludePath));
+  // FIXME: Add the header file locations once the SYCL library and headers
+  //        are properly established within the build.
 }
 
 // Unsupported options for SYCL device compilation.

clang/test/Driver/sycl-offload-jit.cpp

@@ -46,30 +46,6 @@
 // CHK-FSYCL-IS-DEVICE: clang{{.*}} "-fsycl-is-device" {{.*}} "-emit-llvm-bc"
 // CHK-FSYCL-IS-HOST: clang{{.*}} "-fsycl-is-host"
 
-// Verify header search dirs are added with -fsycl
-// RUN: %clang -### -fsycl %s 2>&1 \
-// RUN: | FileCheck %s -check-prefixes=CHECK-HEADER-DIR
-// RUN: %clang_cl -### -fsycl %s 2>&1 \
-// RUN: | FileCheck %s -check-prefixes=CHECK-HEADER-DIR
-// CHECK-HEADER-DIR: clang{{.*}} "-fsycl-is-device"
-// CHECK-HEADER-DIR-SAME: "-internal-isystem" "[[ROOT:[^"]*]]bin{{[/\\]+}}..{{[/\\]+}}include{{[/\\]+}}sycl{{[/\\]+}}stl_wrappers"
-// CHECK-HEADER-DIR-NOT: -internal-isystem
-// CHECK-HEADER-DIR-SAME: "-internal-isystem" "[[ROOT]]bin{{[/\\]+}}..{{[/\\]+}}include"
-// CHECK-HEADER-DIR: clang{{.*}} "-fsycl-is-host"
-// CHECK-HEADER-DIR-SAME: "-internal-isystem" "[[ROOT]]bin{{[/\\]+}}..{{[/\\]+}}include{{[/\\]+}}sycl{{[/\\]+}}stl_wrappers"
-// CHECK-HEADER-DIR-NOT: -internal-isystem
-// CHECK-HEADER-DIR-SAME: "-internal-isystem" "[[ROOT]]bin{{[/\\]+}}..{{[/\\]+}}include"
-
-// Verify no header search dirs are added with -fsycl -nobuiltininc
-// RUN: %clang -### -fsycl -nobuiltininc %s 2>&1 \
-// RUN: | FileCheck %s -check-prefixes=NO-HEADER-DIR
-// RUN: %clang_cl -### -fsycl -nobuiltininc %s 2>&1 \
-// RUN: | FileCheck %s -check-prefixes=NO-HEADER-DIR
-// NO-HEADER-DIR: clang{{.*}} "-fsycl-is-device"
-// NO-HEADER-DIR-NOT: "-internal-isystem" "{{.*}}include{{[/\\]+}}sycl{{[/\\]+}}stl_wrappers"
-// NO-HEADER-DIR: clang{{.*}} "-fsycl-is-host"
-// NO-HEADER-DIR-NOT: "-internal-isystem" "{{.*}}include{{[/\\]+}}sycl{{[/\\]+}}stl_wrappers"
-
 /// Check for option incompatibility with -fsycl
 // RUN: not %clang -### -fsycl -ffreestanding %s 2>&1 \
 // RUN: | FileCheck -check-prefix=CHK-INCOMPATIBILITY %s \