diff options
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 338c541825..20977f239b 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2441,7 +2441,13 @@ void darwin::Link::AddLinkArgs(Compilation &C, // Newer linkers support -demangle, pass it if supported and not disabled by // the user. - if (Version[0] >= 100 && !Args.hasArg(options::OPT_Z_Xlinker__no_demangle)) { + // + // FIXME: We temporarily avoid passing -demangle to any iOS linker, because + // unfortunately we can't be guaranteed that the linker version used there + // will match the linker version detected at configure time. We need the + // universal driver. + if (Version[0] >= 100 && !Args.hasArg(options::OPT_Z_Xlinker__no_demangle) && + !getDarwinToolChain().isTargetIPhoneOS()) { // Don't pass -demangle to ld_classic. // // FIXME: This is a temporary workaround, ld should be handling this. |