diff options
| author | Martin Storsjo <martin@martin.st> | 2018-04-12 20:07:38 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2018-04-12 20:07:38 +0000 |
| commit | fc3f7d36fba17a49f01a0d82c72c0c8d84a40bdf (patch) | |
| tree | 151ad49b5886e476239d2545eeeaf34f1bf80e1f /test/Driver/mingw.cpp | |
| parent | 74d69636471071c87e71690887bcb9b808089086 (diff) | |
| download | clang-fc3f7d36fba17a49f01a0d82c72c0c8d84a40bdf.tar.gz | |
[MinGW] Look for libc++ headers in a triplet prefixed path as well
This makes it consistent with libstdc++ and the other default
include directories.
If these headers are found in both locations and one isn't a
symlink to the other, this will cause errors due to libc++ headers
having wrapper headers for some standard C headers, wrappers that
do #include_next the actual one.
If the same libc++ standard C wrapper header exists in more than one
include directory before the real system one, the header include
guard will stop it from doing another #include_next to pick up the
real one, breaking things.
As this is a rather uncommon situation, this should be acceptable
and toolchain maintainers can adapt accordingly if necessary.
Also simplify some of the existing code with a local variable.
Differential Revision: https://reviews.llvm.org/D45500
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@329946 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Driver/mingw.cpp')
| -rw-r--r-- | test/Driver/mingw.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/Driver/mingw.cpp b/test/Driver/mingw.cpp index 4e25c1dfa0..216ad65362 100644 --- a/test/Driver/mingw.cpp +++ b/test/Driver/mingw.cpp @@ -3,6 +3,10 @@ // CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}include" +// RUN: %clang -target i686-windows-gnu -rtlib=platform -stdlib=libc++ -c -### --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_CLANG_TREE_LIBCXX %s +// CHECK_MINGW_CLANG_TREE_LIBCXX: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1" + + // RUN: %clang -target i686-pc-windows-gnu -rtlib=platform -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_mingw_org_tree/mingw %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ORG_TREE %s // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++" // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32" |