Mercurial > gub
changeset 50:952dc2146023
more merge fixes
| author | janneke <janneke@gnu.org> |
|---|---|
| date | Sat, 26 Nov 2005 09:58:18 +0100 |
| parents | 0e19ad3d7d14 |
| children | 4b118a410f56 |
| files | specs/gub.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/specs/gub.py Sat Nov 26 09:51:42 2005 +0100 +++ b/specs/gub.py Sat Nov 26 09:58:18 2005 +0100 @@ -337,8 +337,9 @@ 'DLLWRAP' : '%(target_architecture)s-dllwrap', 'LD': '%(target_architecture)s-ld', # 'LDFLAGS': '-L%(installdir)s/lib', -# FIXME: for zlib, try adding bin +# FIXME: for zlib, try adding bin 'LDFLAGS': '-L%(installdir)s/lib -L%(installdir)s/bin', + 'MINGW_RUNTIME_DIR': os.environ['MINGW_RUNTIME_DIR'], 'NM': '%(target_architecture)s-nm', 'PKG_CONFIG_PATH': '%(systemdir)s/usr/lib/pkgconfig', 'PKG_CONFIG': '''/usr/bin/pkg-config \ @@ -355,7 +356,7 @@ def dump (self, name, str, mode='w', env={}): dict = self.target_dict (env) - return Package.dump (self, name, str, mode=mode) + return Package.dump (self, name, str, mode=mode, env=dict) def read_pipe (self, cmd, env={}): dict = self.target_dict (env)