diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-10-16 23:20:19 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-10-16 23:20:19 +0000 |
| commit | 95dc57a611ad2571b61b0a2940132b43173432ac (patch) | |
| tree | f04a19ea8addfceef48dacf6644e2d797ea8f9a8 /clang/test/Modules | |
| parent | 128d4ab71f5d95021b7436cd34dd8261e4f1a184 (diff) | |
| download | bcm5719-llvm-95dc57a611ad2571b61b0a2940132b43173432ac.tar.gz bcm5719-llvm-95dc57a611ad2571b61b0a2940132b43173432ac.zip | |
[modules] Allow the error when explicitly loading an incompatible module file
via -fmodule-file= to be turned off; in that case, just include the relevant
files textually. This allows module files to be unconditionally passed to all
compile actions via CXXFLAGS, and to be ignored for rules that specify custom
incompatible flags.
llvm-svn: 250577
Diffstat (limited to 'clang/test/Modules')
| -rw-r--r-- | clang/test/Modules/merge-target-features.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/test/Modules/merge-target-features.cpp b/clang/test/Modules/merge-target-features.cpp index 938715dd6b1..0ca5679ad16 100644 --- a/clang/test/Modules/merge-target-features.cpp +++ b/clang/test/Modules/merge-target-features.cpp @@ -20,7 +20,7 @@ // RUN: -target-cpu i386 \ // RUN: -fsyntax-only merge-target-features.cpp 2>&1 \ // RUN: | FileCheck --check-prefix=SUBSET %s -// SUBSET: AST file was compiled with the target feature'+sse2' but the current translation unit is not +// SUBSET: error: {{.*}} configuration mismatch // // RUN: %clang_cc1 -fmodules -x c++ -fmodules-cache-path=%t \ // RUN: -iquote Inputs/merge-target-features \ @@ -56,8 +56,7 @@ // RUN: -target-cpu i386 -target-feature +cx16 \ // RUN: -fsyntax-only merge-target-features.cpp 2>&1 \ // RUN: | FileCheck --check-prefix=MISMATCH %s -// MISMATCH: AST file was compiled with the target feature'+sse2' but the current translation unit is not -// MISMATCH: current translation unit was compiled with the target feature'+cx16' but the AST file was not +// MISMATCH: error: {{.*}} configuration mismatch #include "foo.h" |
