Author: tkreuzer
Date: Thu Feb 5 12:37:48 2009
New Revision: 39416
URL:
http://svn.reactos.org/svn/reactos?rev=39416&view=rev
Log:
rbuild: improve r37786 a bit
- Link to libgcc_eh for C++ apps.
Modified:
branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1]
Thu Feb 5 12:37:48 2009
@@ -545,9 +545,10 @@
fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC}
-print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () );
fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP}
-print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP}
-print-file-name=libgcc.a)' '$(shell ${TARGET_CPP}
-print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP}
-print-file-name=libmingwex.a)'\n" );
/* hack to get libgcc_eh.a, should check mingw version or something */
- fprintf ( fMakefile, "ifeq ($(ARCH),amd64)\n" );
- fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP}
-print-file-name=libgcc_eh.a)'\n" );
- fprintf ( fMakefile, "endif\n" );
+ if (Environment::GetArch() == "amd64")
+ {
+ fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP}
-print-file-name=libgcc_eh.a)'\n" );
+ }
fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" );
fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" );