mirror of
https://github.com/Relintai/osxcross.git
synced 2025-02-03 22:45:56 +01:00
gcc: always pass -no_compact_unwind to the linker + some cleanup
This commit is contained in:
parent
c375631ff4
commit
cb5b96dd1e
@ -399,8 +399,6 @@ void Target::setupGCCLibs(Arch arch) {
|
|||||||
addLib(GCCLibPath, "gcc_eh");
|
addLib(GCCLibPath, "gcc_eh");
|
||||||
|
|
||||||
fargs.push_back("-lc");
|
fargs.push_back("-lc");
|
||||||
|
|
||||||
if (OSNum <= OSVersion(10, 5))
|
|
||||||
fargs.push_back("-Wl,-no_compact_unwind");
|
fargs.push_back("-Wl,-no_compact_unwind");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -631,20 +629,8 @@ bool Target::setup() {
|
|||||||
fargs.push_back("-nodefaultlibs");
|
fargs.push_back("-nodefaultlibs");
|
||||||
|
|
||||||
if (!isGCH()) {
|
if (!isGCH()) {
|
||||||
std::string tmp;
|
|
||||||
|
|
||||||
tmp = "-L";
|
|
||||||
tmp += SDKPath;
|
|
||||||
tmp += "/usr/lib";
|
|
||||||
|
|
||||||
fargs.push_back(tmp);
|
|
||||||
fargs.push_back("-lc");
|
fargs.push_back("-lc");
|
||||||
|
|
||||||
if (isLibCXX()) {
|
|
||||||
fargs.push_back("-lc++");
|
fargs.push_back("-lc++");
|
||||||
fargs.push_back("-lc++abi");
|
|
||||||
}
|
|
||||||
|
|
||||||
fargs.push_back(OSNum <= OSVersion(10, 4) ? "-lgcc_s.10.4"
|
fargs.push_back(OSNum <= OSVersion(10, 4) ? "-lgcc_s.10.4"
|
||||||
: "-lgcc_s.10.5");
|
: "-lgcc_s.10.5");
|
||||||
}
|
}
|
||||||
@ -654,7 +640,6 @@ bool Target::setup() {
|
|||||||
fargs.push_back("-static-libstdc++");
|
fargs.push_back("-static-libstdc++");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (OSNum <= OSVersion(10, 5))
|
|
||||||
fargs.push_back("-Wl,-no_compact_unwind");
|
fargs.push_back("-Wl,-no_compact_unwind");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user