[ros-diffs] [cfinck] 32618: Add an arHostRule2 to build host .a files Fixes building on 64-bit hosts

[cfinck at svn.reactos.org]

Author: cfinck
Date: Sun Mar  9 11:59:00 2008
New Revision: 32618

URL: http://svn.reactos.org/svn/reactos?rev=3D32618&view=3Drev
Log:
Add an arHostRule2 to build host .a files
Fixes building on 64-bit hosts

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

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/=
mingw/modulehandler.cpp?rev=3D32618&r1=3D32617&r2=3D32618&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Mar  9 1=
1:59:00 2008
@@ -1250,6 +1250,9 @@
 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_noex=
t)_$(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__ $($(m=
odule_name)_CFLAGS)\n",
@@ -1861,7 +1864,10 @@
 		delete definitionFilename;
 	}
 =

-	arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_file=
s );
+    if(module.type =3D=3D HostStaticLibrary)
+        arHostRule2.Execute ( fMakefile, backend, module, archiveFilename,=
 clean_files );
+    else
+        arRule2.Execute ( fMakefile, backend, module, archiveFilename, cle=
an_files );
 =

 	GenerateCleanObjectsAsYouGoCode ();
 =