Mercurial > gub

changeset 4466:e512256b7ba8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Nsis: delay compiler check until after constructor?
author Jan Nieuwenhuizen <janneke@gnu.org>
date Thu, 23 Oct 2008 20:52:52 +0200
parents ce2fdd1807a2
children d61cd73ab3aa
files gub/specs/nsis.py
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/nsis.py	Thu Oct 23 20:43:51 2008 +0200
+++ b/gub/specs/nsis.py	Thu Oct 23 20:52:52 2008 +0200
@@ -32,7 +32,13 @@
         
     def __init__ (self, settings, source):
         toolsbuild.ToolsBuild.__init__ (self, settings, source)
-        if 'x86_64-linux' in self.settings.build_architecture:
+# ugh, no object yet?
+#  File "gub/cross.py", line 121, in setup_linux_x86
+#    package.func (defer_compiler_checks)
+#  File "gub/context.py", line 228, in func
+#    return self.runner.func (f, *args)
+#AttributeError: 'NoneType' object has no attribute 'func'
+        if False and 'x86_64-linux' in self.settings.build_architecture:
             cross.setup_linux_x86 (self, self.add_mingw_env ())
         
     def get_build_dependencies (self):
@@ -69,6 +75,8 @@
         return self.add_mingw_env ()
     
     def compile (self):
+        if 'x86_64-linux' in self.settings.build_architecture:
+            cross.setup_linux_x86 (self, self.add_mingw_env ())
         self.system ('cd %(builddir)s/ && %(compile_command)s',
                      self.build_environment ())