Skip to content

Commit 3bf6fc2

Browse files
aslasl
committedMar 6, 2017
Do not include GCC "resource" directory into the set of built-in include paths on MingW.
Patch by Mateusz Mikuła. Differential Revision: https://reviews.llvm.org/D29464 llvm-svn: 297005
1 parent a6391ae commit 3bf6fc2

File tree

2 files changed

+1
-29
lines changed

2 files changed

+1
-29
lines changed
 

‎clang/lib/Driver/MinGWToolChain.cpp

+1-17
Original file line numberDiff line numberDiff line change
@@ -148,23 +148,17 @@ void MinGW::printVerboseInfo(raw_ostream &OS) const {
148148
// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++
149149
// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\mingw32
150150
// c:\mingw\lib\gcc\mingw32\4.8.1\include\c++\backward
151-
// c:\mingw\lib\gcc\mingw32\4.8.1\include
152151
// c:\mingw\include
153-
// c:\mingw\lib\gcc\mingw32\4.8.1\include-fixed
154152
// c:\mingw\mingw32\include
155153

156154
// Windows, mingw-w64 mingw-builds
157-
// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include
158-
// c:\mingw32\lib\gcc\i686-w64-mingw32\4.9.1\include-fixed
159155
// c:\mingw32\i686-w64-mingw32\include
160156
// c:\mingw32\i686-w64-mingw32\include\c++
161157
// c:\mingw32\i686-w64-mingw32\include\c++\i686-w64-mingw32
162158
// c:\mingw32\i686-w64-mingw32\include\c++\backward
163159

164160
// Windows, mingw-w64 msys2
165-
// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include
166161
// c:\msys64\mingw32\include
167-
// c:\msys64\mingw32\lib\gcc\i686-w64-mingw32\4.9.2\include-fixed
168162
// c:\msys64\mingw32\i686-w64-mingw32\include
169163
// c:\msys64\mingw32\include\c++\4.9.2
170164
// c:\msys64\mingw32\include\c++\4.9.2\i686-w64-mingw32
@@ -174,24 +168,18 @@ void MinGW::printVerboseInfo(raw_ostream &OS) const {
174168
// /usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++
175169
// /usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/x86_64-w64-mingw32
176170
// /usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include/c++/backward
177-
// /usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include
178-
// /usr/lib64/gcc/x86_64-w64-mingw32/5.1.0/include-fixed
179171
// /usr/x86_64-w64-mingw32/sys-root/mingw/include
180172

181173
// Arch Linux
182174
// /usr/i686-w64-mingw32/include/c++/5.1.0
183175
// /usr/i686-w64-mingw32/include/c++/5.1.0/i686-w64-mingw32
184176
// /usr/i686-w64-mingw32/include/c++/5.1.0/backward
185-
// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include
186-
// /usr/lib/gcc/i686-w64-mingw32/5.1.0/include-fixed
187177
// /usr/i686-w64-mingw32/include
188178

189179
// Ubuntu
190180
// /usr/include/c++/4.8
191181
// /usr/include/c++/4.8/x86_64-w64-mingw32
192182
// /usr/include/c++/4.8/backward
193-
// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include
194-
// /usr/lib/gcc/x86_64-w64-mingw32/4.8/include-fixed
195183
// /usr/x86_64-w64-mingw32/include
196184

197185
void MinGW::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
@@ -209,15 +197,11 @@ void MinGW::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
209197
return;
210198

211199
if (GetRuntimeLibType(DriverArgs) == ToolChain::RLT_Libgcc) {
212-
llvm::SmallString<1024> IncludeDir(GccLibDir);
213-
llvm::sys::path::append(IncludeDir, "include");
214-
addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());
215-
IncludeDir += "-fixed";
216200
// openSUSE
217201
addSystemInclude(DriverArgs, CC1Args,
218202
Base + Arch + "/sys-root/mingw/include");
219-
addSystemInclude(DriverArgs, CC1Args, IncludeDir.c_str());
220203
}
204+
221205
addSystemInclude(DriverArgs, CC1Args,
222206
Base + Arch + llvm::sys::path::get_separator() + "include");
223207
addSystemInclude(DriverArgs, CC1Args, Base + "include");

‎clang/test/Driver/mingw.cpp

-12
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++"
88
// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32"
99
// CHECK_MINGW_ORG_TREE: "{{.*}}{{/|\\\\}}Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
10-
// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include"
11-
// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include-fixed"
1210
// CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}mingw32{{/|\\\\}}include"
1311
// CHECK_MINGW_ORG_TREE: {{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}include
1412

@@ -17,17 +15,13 @@
1715
// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++"
1816
// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}i686-w64-mingw32"
1917
// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
20-
// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include"
21-
// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.1{{/|\\\\}}include-fixed"
2218
// CHECK_MINGW_BUILDS_TREE: "{{.*}}/Inputs/mingw_mingw_builds_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
2319

2420

2521
// RUN: %clang -target i686-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_msys2_tree/msys64/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_MSYS_TREE %s
2622
// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64{{/|\\\\}}mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2"
2723
// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}i686-w64-mingw32"
2824
// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.9.2{{/|\\\\}}backward"
29-
// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include"
30-
// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}4.9.2{{/|\\\\}}include-fixed"
3125
// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
3226
// CHECK_MINGW_MSYS_TREE: "{{.*}}/Inputs/mingw_msys2_tree/msys64/mingw32{{/|\\\\}}include"
3327

@@ -36,24 +30,18 @@
3630
// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++"
3731
// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}x86_64-w64-mingw32"
3832
// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}backward"
39-
// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include"
4033
// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}x86_64-w64-mingw32/sys-root/mingw/include"
41-
// CHECK_MINGW_OPENSUSE_TREE: "{{.*}}/Inputs/mingw_opensuse_tree/usr{{/|\\\\}}lib64{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"
4234

4335

4436
// RUN: %clang -target i686-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_arch_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ARCH_TREE %s
4537
// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0"
4638
// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}i686-w64-mingw32"
4739
// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}5.1.0{{/|\\\\}}backward"
48-
// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include"
49-
// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}5.1.0{{/|\\\\}}include-fixed"
5040
// CHECK_MINGW_ARCH_TREE: "{{.*}}/Inputs/mingw_arch_tree/usr{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include"
5141

5242

5343
// RUN: %clang -target x86_64-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_ubuntu_tree/usr %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_UBUNTU_TREE %s
5444
// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8"
5545
// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}x86_64-w64-mingw32"
5646
// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}4.8{{/|\\\\}}backward"
57-
// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include"
58-
// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}4.8{{/|\\\\}}include-fixed"
5947
// CHECK_MINGW_UBUNTU_TREE: "{{.*}}/Inputs/mingw_ubuntu_tree/usr{{/|\\\\}}x86_64-w64-mingw32{{/|\\\\}}include"

0 commit comments

Comments
 (0)
Please sign in to comment.