gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-attach the standard modulemaps on osx.

Browse Source 
This should fix the regressed runtime_cxxmodules on osx.

Patch by Alexander Penev!
This commit is contained in:
Vassil Vassilev 2020-04-06 12:50:38 +03:00 committed by jenkins
parent 9d0f9fe227
commit ae36b2aed0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Interpreter/CIFactory.cpp
View File

@ -629,6 +629,14 @@ namespace {
llvm::SmallString<512> clingModuleMap(clingIncLoc);
llvm::sys::path::append(clingModuleMap, "module.modulemap");
ModuleMapFiles.push_back(clingModuleMap.str().str());
#ifdef __APPLE__
llvm::SmallString<512> libcModuleMap(cIncLoc);
llvm::sys::path::append(libcModuleMap, "module.modulemap");
ModuleMapFiles.push_back(libcModuleMap.str().str());
llvm::SmallString<512> stdModuleMap(stdIncLoc);
llvm::sys::path::append(stdModuleMap, "module.modulemap");
ModuleMapFiles.push_back(stdModuleMap.str().str());
#endif // __APPLE__
}
std::string MOverlay;