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

fix SR-1109: don't use the clang resource override dir for glibc

Browse Source
This commit is contained in:
Todd Fiala
2016-04-22 17:52:49 -06:00
parent 622f49cfec
commit b89c37f2bc
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ClangImporter/ClangImporter.cpp
View File

@@ -391,11 +391,7 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
// and is not included in the resource directory with the other implicit
// module maps. It's at {freebsd|linux}/{arch}/glibc.modulemap.
SmallString<128> GlibcModuleMapPath;
if (!importerOpts.OverrideResourceDir.empty()) {
GlibcModuleMapPath = importerOpts.OverrideResourceDir;
} else if (!searchPathOpts.RuntimeResourcePath.empty()) {
GlibcModuleMapPath = searchPathOpts.RuntimeResourcePath;
}
GlibcModuleMapPath = searchPathOpts.RuntimeResourcePath;
// Running without a resource directory is not a supported configuration.
assert(!GlibcModuleMapPath.empty());