gcc: always pass -no_compact_unwind to the linker + some cleanup

This commit is contained in:
Thomas Pöchtrager 2015-02-08 10:42:02 +01:00
parent c375631ff4
commit cb5b96dd1e

View File

@ -399,8 +399,6 @@ void Target::setupGCCLibs(Arch arch) {
addLib(GCCLibPath, "gcc_eh");
fargs.push_back("-lc");
if (OSNum <= OSVersion(10, 5))
fargs.push_back("-Wl,-no_compact_unwind");
}
@ -631,20 +629,8 @@ bool Target::setup() {
fargs.push_back("-nodefaultlibs");
if (!isGCH()) {
std::string tmp;
tmp = "-L";
tmp += SDKPath;
tmp += "/usr/lib";
fargs.push_back(tmp);
fargs.push_back("-lc");
if (isLibCXX()) {
fargs.push_back("-lc++");
fargs.push_back("-lc++abi");
}
fargs.push_back(OSNum <= OSVersion(10, 4) ? "-lgcc_s.10.4"
: "-lgcc_s.10.5");
}
@ -654,7 +640,6 @@ bool Target::setup() {
fargs.push_back("-static-libstdc++");
}
if (OSNum <= OSVersion(10, 5))
fargs.push_back("-Wl,-no_compact_unwind");
}