Huw Davies : winegcc: Don't use DLLFLAGS in winegcc.

[Alexandre Julliard]

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

Author: Huw Davies <huw at codeweavers.com>
Date:   Tue Aug 27 10:03:43 2013 +0100

winegcc: Don't use DLLFLAGS in winegcc.

---

 tools/winegcc/Makefile.in |    1 -
 tools/winegcc/winegcc.c   |    6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index 37f28fb..3e8bfdd 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -2,7 +2,6 @@ DEFS = \
 	-DINCLUDEDIR="\"$(includedir)\"" \
 	-DDLLDIR="\"$(dlldir)\"" \
 	-DLIBDIR="\"$(libdir)\"" \
-	-DDLLFLAGS="\"@DLLFLAGS@\"" \
 	-DCC="\"$(CC)\"" \
 	-DCPP="\"@CPPBIN@\"" \
 	-DCXX="\"@CXX@\"" \
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 7328a04..969da3e 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -511,7 +511,8 @@ static void compile(struct options* opts, const char* lang)
             strarray_add(comp_args, "-fshort-wchar");
             strarray_add(comp_args, "-DWINE_UNICODE_NATIVE");
 	}
-        strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " "));
+        strarray_add(comp_args, "-D_REENTRANT");
+        strarray_add(comp_args, "-fPIC");
     }
 
     if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64)
@@ -1010,7 +1011,8 @@ static void build(struct options* opts)
     spec_o_name = get_temp_file(output_name, ".spec.o");
     if (opts->force_pointer_size)
         strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
-    strarray_addall(spec_args, strarray_fromstring(DLLFLAGS, " "));
+    strarray_add(spec_args, "-D_REENTRANT");
+    strarray_add(spec_args, "-fPIC");
     strarray_add(spec_args, opts->shared ? "--dll" : "--exe");
     if (fake_module)
     {