diff --git a/CPPBuild/Target.cpp b/CPPBuild/Target.cpp index 5921982..2d173ff 100644 --- a/CPPBuild/Target.cpp +++ b/CPPBuild/Target.cpp @@ -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); } } @@ -992,6 +992,7 @@ void Target::loadTarget(BuildSetup& setup, PackageManager* packages) { cc = "emcc"; ccpp = "emcc"; + linker = "emcc"; ar = "emar"; isEmcc = true; } @@ -1014,6 +1015,7 @@ void Target::loadTarget(BuildSetup& setup, PackageManager* packages) isGcc = true; #endif + linker = ccpp; if (setup.ccache) { cc = "ccache " + cc; diff --git a/CPPBuild/Target.h b/CPPBuild/Target.h index db4caeb..e044ff9 100644 --- a/CPPBuild/Target.h +++ b/CPPBuild/Target.h @@ -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;