[RBUILD]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 15 Apr 2010 18:47:44 +0000 (18:47 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 15 Apr 2010 18:47:44 +0000 (18:47 +0000)
- Link C++ apps to libsupc++.a, needed for recent versions of gcc
- remove amd64 hack

svn path=/trunk/; revision=46884

reactos/tools/rbuild/backend/mingw/mingw.cpp

index 76289ac..7afb0da 100644 (file)
@@ -481,13 +481,10 @@ MingwBackend::GenerateGlobalVariables () const
 
                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");
        }