Skip to content

Commit 6728270

Browse files
committed
Driver: functionally revert the rt search change
Post-commit discussion with Jordan yielded another approach which is viable and allows for cascading searches. Revert the initial change opting for the cascading search.
1 parent fbab60d commit 6728270

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

lib/Driver/ToolChains.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,11 +1172,6 @@ void ToolChain::getResourceDirPath(SmallVectorImpl<char> &resourceDirPath,
11721172
if (const Arg *A = args.getLastArg(options::OPT_resource_dir)) {
11731173
StringRef value = A->getValue();
11741174
resourceDirPath.append(value.begin(), value.end());
1175-
} else if (!getTriple().isOSDarwin() && args.hasArg(options::OPT_sdk)) {
1176-
StringRef value = args.getLastArg(options::OPT_sdk)->getValue();
1177-
resourceDirPath.append(value.begin(), value.end());
1178-
llvm::sys::path::append(resourceDirPath, "usr", "lib",
1179-
shared ? "swift" : "swift_static");
11801175
} else {
11811176
auto programPath = getDriver().getSwiftProgramPath();
11821177
resourceDirPath.append(programPath.begin(), programPath.end());

0 commit comments

Comments
 (0)