diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-16 00:08:24 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-06-16 00:08:24 +0000 |
| commit | 47972afd102f557553d7c6555240bd80982afdd1 (patch) | |
| tree | 0bed0c1be68a6498c9b574dd7fe883aa450bda66 /clang/test/Modules/merge-template-friend.cpp | |
| parent | 345c1449c821a815d23f874d7cb9890003ce2cc1 (diff) | |
| download | bcm5719-llvm-47972afd102f557553d7c6555240bd80982afdd1.tar.gz bcm5719-llvm-47972afd102f557553d7c6555240bd80982afdd1.zip | |
[modules] Simplify -cc1 interface for enabling implicit module maps.
We used to have a flag to enable module maps, and two more flags to enable
implicit module maps. This is all redundant; we don't need any flag for
enabling module maps in the abstract, and we don't usually have -fno- flags for
-cc1. We now have just a single flag, -fimplicit-module-maps, that enables
implicitly searching the file system for module map files and loading them.
The driver interface is unchanged for now. We should probably rename
-fmodule-maps to -fimplicit-module-maps at some point.
llvm-svn: 239789
Diffstat (limited to 'clang/test/Modules/merge-template-friend.cpp')
| -rw-r--r-- | clang/test/Modules/merge-template-friend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/test/Modules/merge-template-friend.cpp b/clang/test/Modules/merge-template-friend.cpp index 8a1910dad62..37508a6c639 100644 --- a/clang/test/Modules/merge-template-friend.cpp +++ b/clang/test/Modules/merge-template-friend.cpp @@ -1,14 +1,14 @@ // RUN: rm -rf %t // -// RUN: %clang_cc1 -fmodules -x c++ -fmodules-cache-path=%t \ +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++ -fmodules-cache-path=%t \ // RUN: -emit-module -fmodule-name=a -o %t/a.pcm \ // RUN: %S/Inputs/merge-template-friend/module.modulemap // -// RUN: %clang_cc1 -fmodules -x c++ -fmodules-cache-path=%t \ +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++ -fmodules-cache-path=%t \ // RUN: -emit-module -fmodule-name=b -o %t/b.pcm \ // RUN: %S/Inputs/merge-template-friend/module.modulemap // -// RUN: %clang_cc1 -fmodules -x c++ -fmodules-cache-path=%t \ +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++ -fmodules-cache-path=%t \ // RUN: -I%S/Inputs/merge-template-friend \ // RUN: -fmodule-file=%t/a.pcm \ // RUN: -fmodule-file=%t/b.pcm \ |
