[ros-diffs] [tkreuzer] 46884: [RBUILD] - Link C++ apps to libsupc++.a, needed for recent versions of gcc - remove amd64 hack

Author: tkreuzer
Date: Thu Apr 15 20:47:44 2010
New Revision: 46884

URL: http://svn.reactos.org/svn/reactos?rev=46884&view=rev
Log:
[RBUILD]
- Link C++ apps to libsupc++.a, needed for recent versions of gcc
- remove amd64 hack

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

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/...
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Thu Apr 15 20:47:44 2010
@@ -481,13 +481,10 @@

fprintf ( fMakefile, "PROJECT_CCLIBS := "$(shell ${TARGET_CC} -print-libgcc-file-name)"\n" );

-		fprintf ( fMakefile, "PROJECT_CXXLIBS := "$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)" "$(shell ${TARGET_CPP} -print-libgcc-file-name)" "$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)" "$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)"" );
+		fprintf ( fMakefile, "PROJECT_CXXLIBS := "$(shell ${TARGET_CPP} -print-file-name=libsupc++.a)" "$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)" "$(shell ${TARGET_CPP} -print-libgcc-file-name)" "$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)" "$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)"" );
    	
-		/* hack to get libgcc_eh.a, should check mingw version or something */
-		if (Environment::GetArch() == "amd64")
-			fprintf ( fMakefile, " "$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)"" );
    	/* hack to get _get_output_format, needed by libmingwex */
-		else if (Environment::GetArch() == "i386")
+		if (Environment::GetArch() == "i386")
    		fprintf ( fMakefile, " "$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)" ");
    	fprintf ( fMakefile,"\n");
    }