From 54ab4d0d041edbedeb07e9f43d8754d9874ea4f8 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sun, 9 Mar 2008 10:59:00 +0000 Subject: [PATCH] Add an arHostRule2 to build host .a files Fixes building on 64-bit hosts svn path=/trunk/; revision=32618 --- reactos/tools/rbuild/backend/mingw/modulehandler.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index 47af36fd2f0..4fe47145200 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -1250,6 +1250,9 @@ Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); +Rule arHostRule2 ( "\t$(ECHO_AR)\n" + "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", + NULL ); Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(module_name)_CFLAGS)\n", @@ -1861,7 +1864,10 @@ MingwModuleHandler::GenerateArchiveTarget () delete definitionFilename; } - arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_files ); + if(module.type == HostStaticLibrary) + arHostRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_files ); + else + arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_files ); GenerateCleanObjectsAsYouGoCode ();