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/add-remove-private.m | |
| 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/add-remove-private.m')
| -rw-r--r-- | clang/test/Modules/add-remove-private.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/test/Modules/add-remove-private.m b/clang/test/Modules/add-remove-private.m index 49e81e11141..dc73a096c80 100644 --- a/clang/test/Modules/add-remove-private.m +++ b/clang/test/Modules/add-remove-private.m @@ -4,20 +4,20 @@ // RUN: cp -r %S/Inputs/AddRemovePrivate.framework %t/AddRemovePrivate.framework // Build with module.private.modulemap -// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -verify -DP +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -verify -DP // RUN: cp %t.mcp/AddRemovePrivate.pcm %t/with.pcm // Build without module.private.modulemap // RUN: rm %t/AddRemovePrivate.framework/Modules/module.private.modulemap -// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -verify +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -verify // RUN: not diff %t.mcp/AddRemovePrivate.pcm %t/with.pcm // RUN: cp %t.mcp/AddRemovePrivate.pcm %t/without.pcm -// RUN: not %clang_cc1 -fmodules -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -DP 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -DP 2>&1 | FileCheck %s // CHECK: no submodule named 'Private' // Build with module.private.modulemap (again) // RUN: cp %S/Inputs/AddRemovePrivate.framework/Modules/module.private.modulemap %t/AddRemovePrivate.framework/Modules/module.private.modulemap -// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -verify -DP +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t.mcp -fdisable-module-hash -F %t %s -verify -DP // RUN: not diff %t.mcp/AddRemovePrivate.pcm %t/without.pcm // expected-no-diagnostics |
