Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CPPBuild/Target.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ void Target::link()

File::writeAllText(responsefilename, responsefile);

std::string cmdline = ccpp + " \"@" + responsefilename + "\"";
std::string cmdline = linker + " \"@" + responsefilename + "\"";
runCommand(cmdline, "Could not link " + outputFile);
}
}
Expand Down Expand Up @@ -992,6 +992,7 @@ void Target::loadTarget(BuildSetup& setup, PackageManager* packages)
{
cc = "emcc";
ccpp = "emcc";
linker = "emcc";
ar = "emar";
isEmcc = true;
}
Expand All @@ -1014,6 +1015,7 @@ void Target::loadTarget(BuildSetup& setup, PackageManager* packages)
isGcc = true;
#endif

linker = ccpp;
if (setup.ccache)
{
cc = "ccache " + cc;
Expand Down
2 changes: 1 addition & 1 deletion CPPBuild/Target.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Target
bool isMsvc = false;
bool isEmcc = false;

std::string cc, ccpp;
std::string cc, ccpp, linker;
std::string ar;
std::string cflags, cxxflags;
std::string linkFlags;
Expand Down
Loading