Fixing build breakage

master.cfg

@@ -456,27 +456,28 @@ The parameters of the class are:
     CompileClass = CompileGDB
     TestClass = TestGDB
 
+    extra_conf_flags = None
+
+    extra_make_flags = None
+    extra_make_check_flags = None
+    test_env = None
+
+    # Set this to false to disable parallel testing (i.e., do not use
+    # FORCE_PARALLEL)
+    test_parallel = True
+
+    # Set this to the make command that you want to run in the "make"
+    # steps.
+    make_command = 'make'
+
+    # Set this to False to disable using system's debuginfo files
+    # (i.e., do not use '--with-separate-debug-dir')
+    use_system_debuginfo = True
+
     def __init__ (self, architecture_triplet = []):
         factory.BuildFactory.__init__ (self)
 
         self.architecture_triplet = architecture_triplet
-        self.extra_conf_flags = None
-
-        self.extra_make_flags = None
-        self.extra_make_check_flags = None
-        self.test_env = None
-
-        # Set this to false to disable parallel testing (i.e., do not use
-        # FORCE_PARALLEL)
-        self.test_parallel = True
-
-        # Set this to the make command that you want to run in the "make"
-        # steps.
-        self.make_command = 'make'
-
-        # Set this to False to disable using system's debuginfo files
-        # (i.e., do not use '--with-separate-debug-dir')
-        self.use_system_debuginfo = True
 
         self.addStep (RemoveDirectory (dir = WithProperties (r"%s/build",
                                                              r'builddir'),