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

Fix libcxx on osx15.3

Browse Source
This commit is contained in:
Vassil Vassilev 2024-03-08 20:40:23 +00:00 committed by jenkins
parent 057bdb107a
commit ccc4b87fe7
2 changed files with 2083 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2064
include/cling/std_darwin.modulemap Normal file
View File

File diff suppressed because it is too large Load Diff

28
lib/Interpreter/CIFactory.cpp
View File

@ -631,7 +631,7 @@ namespace {
cling::log() << "'" << systemLoc << "' does not exist. Mounting '"
<< originalLoc.str() << "' as '" << systemLoc << "'\n";
if (!HSOpts.ImplicitModuleMaps) {
if (!HSOpts.ImplicitModuleMaps && !llvm::sys::fs::exists(systemLoc.str())) {
modulemapFilename = Filename;
llvm::sys::path::remove_filename(systemLoc);
llvm::sys::path::append(systemLoc, modulemapFilename);
@ -652,6 +652,8 @@ namespace {
ModuleMapFiles.push_back(systemLoc.str().str());
};
const llvm::Triple &Triple = CI.getTarget().getTriple();
if (!HSOpts.ImplicitModuleMaps) {
// Register the modulemap files.
llvm::SmallString<512> resourceDirLoc(HSOpts.ResourceDir);
@ -660,17 +662,20 @@ 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__
if (Triple.isMacOSX()) {
llvm::SmallString<512> libcModuleMap(cIncLoc);
llvm::sys::path::append(libcModuleMap, "module.modulemap");
ModuleMapFiles.push_back(libcModuleMap.str().str());
if (CI.getTarget().getSDKVersion() < VersionTuple(14, 4)) {
llvm::SmallString<512> stdModuleMap(stdIncLoc);
llvm::sys::path::append(stdModuleMap, "module.modulemap");
ModuleMapFiles.push_back(stdModuleMap.str().str());
}
}
}
std::string MOverlay;
#ifdef _WIN32
maybeAppendOverlayEntry(vcIncLoc.str(), "vcruntime.modulemap",
clingIncLoc.str().str(), MOverlay,
@ -697,6 +702,11 @@ namespace {
clingIncLoc.str().str(), MOverlay,
/*RegisterModuleMap=*/ true,
/*AllowModulemapOverride=*/true);
if (Triple.isMacOSX() && CI.getTarget().getSDKVersion() >= VersionTuple(14, 4))
maybeAppendOverlayEntry(stdIncLoc.str(), "std_darwin.modulemap",
clingIncLoc.str().str(), MOverlay,
/*RegisterModuleMap=*/ true,
/*AllowModulemapOverride=*/ false);
#endif // _WIN32
if (!tinyxml2IncLoc.empty())