Merge branch 'gallium-edgeflags'

[mesa.git] / scons / crossmingw.py

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index bf81f16fd6404f5b981be197caa19d453ec9499b..9cb0b89e3c7849539e05f48f010d0ae797c6b36d 100644 (file)
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -108,7 +108,7 @@ def shlib_emitter(target, source, env):
     return (target, source)
                          
 
-shlib_action = SCons.Action.Action(shlib_generator, generator=1)
+shlib_action = SCons.Action.Action(shlib_generator, '$SHLINKCOMSTR', generator=1)
 
 res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
 
@@ -177,7 +177,7 @@ def generate(env):
     # default in recent gcc versions
     env.AppendUnique(CFLAGS = ['-gstabs'])
 
-    env.AppendUnique(LIBS = ['iberty'])
+    #env.AppendUnique(LIBS = ['iberty'])
     env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
     #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at'])