[ros-diffs] [cfinck] 34347: 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.

cfinck at svn.reactos.org cfinck at svn.reactos.org
Mon Jul 7 00:32:07 CEST 2008


Author: cfinck
Date: Sun Jul  6 17:32:07 2008
New Revision: 34347

URL: http://svn.reactos.org/svn/reactos?rev=34347&view=rev
Log:
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.

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=34347&r1=34346&r2=34347&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jul  6 17:32:07 2008
@@ -2462,9 +2462,14 @@
 	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",



More information about the Ros-diffs mailing list