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

revert r11411, which completely broke the makefile build.

Browse Source 
Swift SVN r11414
This commit is contained in:
Chris Lattner
2013-12-18 04:33:58 +00:00
parent b1ba2ac303
commit 073974dca4
9 changed files with 54 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Frontend/CompilerInvocation.cpp
View File

@@ -36,32 +36,6 @@ void CompilerInvocation::setMainExecutablePath(StringRef Path) {
setRuntimeIncludePath(LibPath.str());
}
void CompilerInvocation::setRuntimeIncludePath(StringRef Path) {
llvm::SmallString<128> LibPath(Path);
SearchPathOpts.RuntimeIncludePath = LibPath.str();
updateRuntimeImportPath();
}
void CompilerInvocation::updateRuntimeImportPath() {
llvm::SmallString<128> LibPath(SearchPathOpts.RuntimeIncludePath);
llvm::Triple Triple(TargetOpts.Triple);
if (Triple.isiOS())
if (Triple.getArch() == llvm::Triple::ArchType::x86)
llvm::sys::path::append(LibPath, "iphonesimulator");
else
llvm::sys::path::append(LibPath, "iphoneos");
else if (Triple.isMacOSX())
llvm::sys::path::append(LibPath, "macosx");
SearchPathOpts.RuntimeImportPath = LibPath.str();
}
void CompilerInvocation::setTargetTriple(StringRef Triple) {
TargetOpts.Triple = Triple.str();
updateRuntimeImportPath();
}
// TODO: remove InputKind param once we support storing it in FrontendOptions
static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
DiagnosticEngine &Diags,
@@ -266,12 +240,7 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts, ArgList &Args,
}
// Opts.RuntimeIncludePath is set by calls to
// setRuntimeIncludePath() or setMainExecutablePath().
// Opts.RuntimeImportPath is set by calls to
// setRuntimeIncludePath() or setMainExecutablePath() and
// updated by calls to setTargetTriple() or parseArgs().
// Assumes exactly one of setMainExecutablePath() or setRuntimeIncludePath()
// is called before setTargetTriple() and parseArgs().
// CompilerInvocation::setRuntimeIncludePath().
// TODO: improve the handling of RuntimeIncludePath.
return false;
@@ -373,9 +342,6 @@ bool CompilerInvocation::parseArgs(ArrayRef<const char *> Args,
return true;
}
// Target options may have changed this path.
updateRuntimeImportPath();
if (ParseDiagnosticArgs(DiagnosticOpts, *ParsedArgs, Diags)) {
return true;
}