From c7f03eaf32ba636e6972b2820b9277e52d9b02ba Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sun, 6 Jul 2008 22:32:07 +0000 Subject: [PATCH] Revert r34346, it didn't work the way I thought because of different CRT's on every host. Using gcc/g++ as the frontend will link to it automatically. Sorry for the wasted commit. svn path=/trunk/; revision=34347 --- reactos/tools/rbuild/backend/mingw/modulehandler.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index ae638e2d603..2a06f294f39 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -2462,10 +2462,15 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget () string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); - string linker = "${host_ld}"; GenerateRules (); + string linker; + if ( module.cplusplus ) + linker = "${host_gpp}"; + else + linker = "${host_gcc}"; + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (),