Mercurial > gub
changeset 5532:ca7ec8a2d0b5
Oops, .la disable fixes. Fixes mingw g++ compilation.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 21 Aug 2009 13:20:01 +0200 |
| parents | d6fd5f779ca0 |
| children | 1abfa0b8d306 |
| files | gub/build.py gub/specs/cross/gcc.py gub/specs/gcc.py |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/build.py Fri Aug 21 12:19:36 2009 +0200 +++ b/gub/build.py Fri Aug 21 13:20:01 2009 +0200 @@ -652,8 +652,8 @@ def disable_libtool_la_files (self, pattern): def disable_la (logger, file_name): - loggedos.move (file_name, file_name + '-') - self.map_find_files (disable_la, '%(install_prefix)s/lib[.]la', pattern) + loggedos.rename (logger, file_name, file_name + '-') + self.map_find_files (disable_la, '%(install_prefix)s', 'lib' + pattern + '.la') # Used in mingw python and liblpsolve. Better replace this by # fixing the gcc linking command?
--- a/gub/specs/cross/gcc.py Fri Aug 21 12:19:36 2009 +0200 +++ b/gub/specs/cross/gcc.py Fri Aug 21 13:20:01 2009 +0200 @@ -70,7 +70,7 @@ cross.AutoBuild.install (self) gcc.move_target_libs (self, '%(install_prefix)s%(cross_dir)s/%(target_architecture)s') gcc.move_target_libs (self, '%(install_prefix)s%(cross_dir)s/lib') - self.disable_libtool_la_files ('libstdc[+][+]') + self.disable_libtool_la_files ('stdc[+][+]') class Gcc__from__source (Gcc): def _get_build_dependencies (self):
--- a/gub/specs/gcc.py Fri Aug 21 12:19:36 2009 +0200 +++ b/gub/specs/gcc.py Fri Aug 21 13:20:01 2009 +0200 @@ -51,7 +51,7 @@ tools.AutoBuild.install (self) move_target_libs (self, '%(install_prefix)s/%(target_architecture)s') # move_target_libs ('%(install_prefix)s%/lib') - self.disable_libtool_la_files ('libstdc[+][+]') + self.disable_libtool_la_files ('stdc[+][+]') def do_not_look_in_slash_usr (self): # GUB [cross] compilers must NOT look in /usr.