Alexandre Julliard : winegcc: Don't pass the as/ld/nm commands to winebuild .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a5947ffcd1ffbf15587ebdcf206efdfd308a2a47
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a5947ffcd1ffbf15587ebdcf20...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Feb  6 20:35:56 2009 +0100

winegcc: Don't pass the as/ld/nm commands to winebuild.

winebuild should be able to find them on its own.

---

 Make.rules.in           |    2 +-
 tools/winegcc/winegcc.c |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 7066c98..3645603 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -62,7 +62,7 @@ ALLCFLAGS    = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLA
 ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
 IDLFLAGS     = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
 TARGETFLAGS  = @TARGETFLAGS@
-WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) --as-cmd "$(AS)"
+WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS)
 MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
 WINEWRAPPER  = $(TOPSRCDIR)/tools/winewrapper
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index b288ed0..08929a3 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -646,12 +646,6 @@ static void build(struct options* opts)
     }
     if (opts->force_pointer_size)
         strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
-    strarray_add(spec_args, "--as-cmd");
-    strarray_add(spec_args, AS);
-    strarray_add(spec_args, "--ld-cmd");
-    strarray_add(spec_args, LD);
-    strarray_add(spec_args, "--nm-cmd");
-    strarray_add(spec_args, NM);
     strarray_addall(spec_args, strarray_fromstring(DLLFLAGS, " "));
     strarray_add(spec_args, opts->shared ? "--dll" : "--exe");
     strarray_add(spec_args, "-o");