File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -37,6 +37,10 @@ extension Module: Buildable {
37
37
///FIXME: The user provided modulemap should be copied to build dir
38
38
///but that requires copying the complete include dir because it'll
39
39
///mostly likely contain relative paths.
40
+ ///FIXME: This is already computed when trying to generate modulemap
41
+ ///in ClangModule's `generateModuleMap(inDir wd: String)`
42
+ ///there shouldn't be need to redo this but is difficult in
43
+ ///current architecture
40
44
if module. moduleMapPath. isFile {
41
45
return [ " -Xcc " , " -fmodule-map-file= \( module. moduleMapPath) " ]
42
46
}
Original file line number Diff line number Diff line change @@ -48,6 +48,10 @@ extension ClangModule {
48
48
case UnsupportedIncludeLayoutForModule( String )
49
49
}
50
50
51
+ ///FIXME: we recompute the generated modulemap's path
52
+ ///when building swift modules in `XccFlags(prefix: String)`
53
+ ///there shouldn't be need to redo this there but is difficult
54
+ ///in current architecture
51
55
public func generateModuleMap( inDir wd: String ) throws {
52
56
53
57
///Return if module map is already present
@@ -88,9 +92,10 @@ extension ClangModule {
88
92
89
93
let umbrellaHeader = Path . join ( moduleHeaderDir, " \( c99name) .h " )
90
94
95
+ ///warn user if in case module name and c99name are different and there a `name.h` umbrella header
91
96
let invalidUmbrellaHeader = Path . join ( moduleHeaderDir, " \( name) .h " )
92
97
if c99name != name && invalidUmbrellaHeader. isFile {
93
- print ( " warning: \( invalidUmbrellaHeader) should be renamed to \( umbrellaHeader) to be used as Umbrella header " )
98
+ print ( " warning: \( invalidUmbrellaHeader) should be renamed to \( umbrellaHeader) to be used as an umbrella header " )
94
99
}
95
100
96
101
if umbrellaHeader. isFile {
You can’t perform that action at this time.
0 commit comments