From dadf662776332bccfccff7947851e43668b5b341 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 5 Feb 2009 18:37:48 +0000
Subject: [PATCH] rbuild: improve r37786 a bit - Link to libgcc_eh for C++
 apps.

svn path=/branches/ros-amd64-bringup/; revision=39416
---
 reactos/tools/rbuild/backend/mingw/mingw.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index 58dc044b791..1da35ecc6a0 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -545,9 +545,10 @@ MingwBackend::GenerateGlobalVariables () const
 	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" );