Base the sys-root/mingw/include path on sysroot and not on /usr.

Thanks to Richard Smith for pointing this out!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@243144 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/MinGWToolChain.cpp b/lib/Driver/MinGWToolChain.cpp
index d68c8afdd78179e84ea4511cc658071fb7de08d0..c4aac0455645d9f35ef5aa7ec74cfdee03338333 100644 (file)
--- a/lib/Driver/MinGWToolChain.cpp
+++ b/lib/Driver/MinGWToolChain.cpp
@@ -202,7 +202,7 @@ void MinGW::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
     IncludeDir += "-fixed";
     // openSUSE
     addSystemInclude(DriverArgs, CC1Args,
-                     "/usr/x86_64-w64-mingw32/sys-root/mingw/include");
+                     Base + Arch + "/sys-root/mingw/include");
     addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());
   }
   addSystemInclude(DriverArgs, CC1Args,

diff --git a/test/Driver/mingw.cpp b/test/Driver/mingw.cpp
index 4f4c4bd44b5d879422499f3e3afc45017c67fc14..5625c88b80515162f985ba9e245eec7edfdaf47b 100644 (file)
--- a/test/Driver/mingw.cpp
+++ b/test/Driver/mingw.cpp
@@ -32,7 +32,7 @@
 // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}x86_64-w64-mingw32"\r
 // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"\r
 // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include"\r
-// CHECK_MINGW_OPENSUSE_TREE: "/usr/x86_64-w64-mingw32/sys-root/mingw/include"\r
+// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}x86_64-w64-mingw32/sys-root/mingw/include"\r
 // CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"\r
 \r
 \r