Search for libstdc++.dylib in llvm-gcc's files on darwin10. rdar://10419079
llvm-svn: 144381
This commit is contained in:
parent
ea28a34c43
commit
1a9ad0fbee
|
@ -334,8 +334,11 @@ void DarwinClang::AddLinkSearchPathArgs(const ArgList &Args,
|
||||||
// Unfortunately, we still might depend on a few of the libraries that are
|
// Unfortunately, we still might depend on a few of the libraries that are
|
||||||
// only available in the gcc library directory (in particular
|
// only available in the gcc library directory (in particular
|
||||||
// libstdc++.dylib). For now, hardcode the path to the known install location.
|
// libstdc++.dylib). For now, hardcode the path to the known install location.
|
||||||
|
// FIXME: This should get ripped out someday. However, when building on
|
||||||
|
// 10.6 (darwin10), we're still relying on this to find libstdc++.dylib.
|
||||||
llvm::sys::Path P(getDriver().Dir);
|
llvm::sys::Path P(getDriver().Dir);
|
||||||
P.eraseComponent(); // .../usr/bin -> ../usr
|
P.eraseComponent(); // .../usr/bin -> ../usr
|
||||||
|
P.appendComponent("llvm-gcc-4.2");
|
||||||
P.appendComponent("lib");
|
P.appendComponent("lib");
|
||||||
P.appendComponent("gcc");
|
P.appendComponent("gcc");
|
||||||
switch (getTriple().getArch()) {
|
switch (getTriple().getArch()) {
|
||||||
|
@ -709,6 +712,8 @@ void DarwinClang::AddCXXStdlibLibArgs(const ArgList &Args,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Otherwise, look in the root.
|
// Otherwise, look in the root.
|
||||||
|
// FIXME: This should be removed someday when we don't have to care about
|
||||||
|
// 10.6 and earlier, where /usr/lib/libstdc++.dylib does not exist.
|
||||||
if ((llvm::sys::fs::exists("/usr/lib/libstdc++.dylib", Exists) || !Exists)&&
|
if ((llvm::sys::fs::exists("/usr/lib/libstdc++.dylib", Exists) || !Exists)&&
|
||||||
(!llvm::sys::fs::exists("/usr/lib/libstdc++.6.dylib", Exists) && Exists)){
|
(!llvm::sys::fs::exists("/usr/lib/libstdc++.6.dylib", Exists) && Exists)){
|
||||||
CmdArgs.push_back("/usr/lib/libstdc++.6.dylib");
|
CmdArgs.push_back("/usr/lib/libstdc++.6.dylib");
|
||||||
|
|
Loading…
Reference in New Issue