Skip to content

Commit c976dfb

Browse files
committed
Move modulemap to header search directory. NFC intended.
In code we use `#include "swift/Lib/Header.h"` which is located in "include/swift/Lib/Header.h", so we use "include/" as a header search path. We should put modulemaps in the same directory and shouldn't rely on clang to search in immediate subdirectories. rdar://106677321
1 parent 181161c commit c976dfb

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

include/module.modulemap

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
module BasicBridging {
2+
header "swift/Basic/BridgedSwiftObject.h"
3+
header "swift/Basic/BasicBridging.h"
4+
header "swift/Basic/SourceLoc.h"
5+
requires cplusplus
6+
export *
7+
}
8+
9+
module CBasicBridging {
10+
header "swift/Basic/CBasicBridging.h"
11+
}
12+
13+
module ASTBridging {
14+
header "swift/AST/AnyFunctionRef.h"
15+
header "swift/AST/ASTBridging.h"
16+
header "swift/AST/Builtins.h"
17+
header "swift/AST/DiagnosticEngine.h"
18+
header "swift/AST/DiagnosticConsumer.h"
19+
header "swift/AST/ForeignAsyncConvention.h"
20+
header "swift/AST/ForeignErrorConvention.h"
21+
header "swift/AST/SubstitutionMap.h"
22+
23+
textual header "swift/AST/Builtins.def"
24+
25+
requires cplusplus
26+
export *
27+
}
28+
29+
module CASTBridging {
30+
header "swift/AST/CASTBridging.h"
31+
}
32+
33+
module SILBridging {
34+
header "swift/SIL/SILBridging.h"
35+
header "swift/SIL/SILLocation.h"
36+
requires cplusplus
37+
export *
38+
}
39+
40+
module OptimizerBridging {
41+
header "swift/SILOptimizer/OptimizerBridging.h"
42+
export *
43+
}
44+
45+
module _RegexParserBridging {
46+
header "swift/Parse/RegexParserBridging.h"
47+
export *
48+
}

include/swift/module.modulemap

-48
This file was deleted.

0 commit comments

Comments
 (0)