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

Add -[no-]link-objc-runtime option that controls the linking of arclite.

Browse Source 
Currently arclite is never linked into a binary unless you pass the option.
See <rdar://problem/16679045> for more information.

Swift SVN r17003
This commit is contained in:
Jordan Rose
2014-04-28 23:39:16 +00:00
parent 84f4d3b9fa
commit 8f80f43e72
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Driver/Tools.cpp
View File

@@ -400,6 +400,10 @@ Job *darwin::Linker::constructJob(const JobAction &JA,
assert(Output->getPrimaryOutputType() == types::TY_Image &&
"Invalid linker output type.");
const toolchains::Darwin &TC = getDarwinToolChain();
const Driver &D = TC.getDriver();
const llvm::Triple &Triple = TC.getTriple();
ArgStringList Arguments;
addPrimaryInputsOfType(Arguments, Inputs.get(), types::TY_Object);
addInputsOfType(Arguments, InputActions, types::TY_Object);
@@ -435,6 +439,21 @@ Job *darwin::Linker::constructJob(const JobAction &JA,
break;
}
if (Args.hasFlag(options::OPT_link_objc_runtime,
options::OPT_no_link_objc_runtime,
/*default=*/false)) {
// FIXME: Copied from Clang's ToolChains.cpp.
llvm::SmallString<128> ARCLiteLib(D.getSwiftProgramPath());
llvm::sys::path::remove_filename(ARCLiteLib); // 'swift'
llvm::sys::path::remove_filename(ARCLiteLib); // 'bin'
llvm::sys::path::append(ARCLiteLib, "lib", "arc", "libarclite_");
ARCLiteLib += getPlatformNameForTriple(Triple);
ARCLiteLib += ".a";
Arguments.push_back("-force_load");
Arguments.push_back(Args.MakeArgString(ARCLiteLib));
}
Args.AddAllArgValues(Arguments, options::OPT_Xlinker);
Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
Args.AddAllArgs(Arguments, options::OPT_F);
@@ -453,9 +472,6 @@ Job *darwin::Linker::constructJob(const JobAction &JA,
Arguments.push_back("-lSystem");
AddDarwinArch(Args, Arguments);
const toolchains::Darwin &TC = getDarwinToolChain();
const Driver &D = TC.getDriver();
// Add the runtime library link path, which is platform-specific and found
// relative to the compiler.
// FIXME: Duplicated from CompilerInvocation, but in theory the runtime
@@ -482,7 +498,6 @@ Job *darwin::Linker::constructJob(const JobAction &JA,
Arguments.push_back(Args.MakeArgString(RuntimeLibPath));
// FIXME: Properly handle deployment targets.
llvm::Triple Triple = TC.getTriple();
assert(Triple.isiOS() || Triple.isMacOSX());
if (Triple.isiOS()) {
if (tripleIsiOSSimulator(Triple))