From c56419ed008706801749b151672ed88bfab855f2 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 31 Jul 2015 00:58:32 +0000 Subject: [modules] Fix issue where building a module from a relative path when -working-directory option is set, results in error. The error was "module '' was built in directory '' but now resides in directory '' rdar://21330027 llvm-svn: 243718 --- .../Inputs/working-dir-test/Test.framework/Headers/Test.h | 1 + .../working-dir-test/Test.framework/Modules/module.modulemap | 6 ++++++ clang/test/Modules/working-dir-flag.m | 9 +++++++++ 3 files changed, 16 insertions(+) create mode 100644 clang/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h create mode 100644 clang/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap create mode 100644 clang/test/Modules/working-dir-flag.m (limited to 'clang/test/Modules') diff --git a/clang/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h new file mode 100644 index 00000000000..ecc54bfc725 --- /dev/null +++ b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h @@ -0,0 +1 @@ +void test_me_call(void); diff --git a/clang/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap new file mode 100644 index 00000000000..3040ac722f9 --- /dev/null +++ b/clang/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Test { + umbrella header "Test.h" + + export * + module * { export * } +} diff --git a/clang/test/Modules/working-dir-flag.m b/clang/test/Modules/working-dir-flag.m new file mode 100644 index 00000000000..0e258c0d2fe --- /dev/null +++ b/clang/test/Modules/working-dir-flag.m @@ -0,0 +1,9 @@ +// RUN: rm -rf %t.mcp +// RUN: %clang_cc1 -fmodules-cache-path=%t.mcp -fmodules -fimplicit-module-maps -F . -working-directory=%S/Inputs/working-dir-test %s -verify +// expected-no-diagnostics + +@import Test; + +void foo() { + test_me_call(); +} -- cgit v1.2.3