averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76620 from rmaz/sdkprefix

Browse Source 
Do not prefix relative SDK paths twice
This commit is contained in:
Richard Howell
2024-09-30 07:38:44 -07:00
committed by GitHub
parent ba8f8ea282 a04ddefb10
commit c9b0a2a43f
7 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -1828,7 +1828,7 @@ bool ModuleFileSharedCore::hasSourceInfo() const {
std::string ModuleFileSharedCore::resolveModuleDefiningFilePath(const StringRef SDKPath) const {
if (!ModuleInterfacePath.empty()) {
std::string interfacePath = ModuleInterfacePath.str();
if (llvm::sys::path::is_relative(interfacePath)) {
if (llvm::sys::path::is_relative(interfacePath) && !ModuleInterfacePath.starts_with(SDKPath)) {
SmallString<128> absoluteInterfacePath(SDKPath);
llvm::sys::path::append(absoluteInterfacePath, interfacePath);
return absoluteInterfacePath.str().str();