Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-03 22:45:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Pöchtrager 2015-02-08 10:42:02 +01:00
parent c375631ff4
commit cb5b96dd1e
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wrapper/target.cpp
View File

@ -399,9 +399,7 @@ void Target::setupGCCLibs(Arch arch) {
addLib(GCCLibPath, "gcc_eh"); addLib(GCCLibPath, "gcc_eh");
fargs.push_back("-lc"); fargs.push_back("-lc");
fargs.push_back("-Wl,-no_compact_unwind");
if (OSNum <= OSVersion(10, 5))
fargs.push_back("-Wl,-no_compact_unwind");
} }
bool Target::setup() { bool Target::setup() {
@ -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");
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" fargs.push_back(OSNum <= OSVersion(10, 4) ? "-lgcc_s.10.4"
: "-lgcc_s.10.5"); : "-lgcc_s.10.5");
} }
@ -654,8 +640,7 @@ 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");
} }
auto addCXXHeaderPath = [&](const std::string &path) { auto addCXXHeaderPath = [&](const std::string &path) {