FIXME: waf: Fatal if builders already exist

1 files changed, 10 insertions, 10 deletions

diff --git a/wscript b/wscript
index 3444c2b9..0c762b81 100644
--- a/wscript
+++ b/wscript
@@ -63,15 +63,16 @@ def load_conf_from_file(f):
 
 def create_builder(conf):
     global builders
-    if builders is None:
-        builders = []
-        for bs in conf.env.BUILDSET:
-            builder = waf_libbsd.Builder()
-            libbsd.load(builder)
-            bsconfig = load_conf_from_file(bs)
-            builder.updateConfiguration(bsconfig)
-            builder.generate(rtems_version)
-            builders.append(builder)
+    if builders is not None:
+        conf.fatal('builders created multiple times')
+    builders = []
+    for bs in conf.env.BUILDSET:
+        builder = waf_libbsd.Builder()
+        libbsd.load(builder)
+        bsconfig = load_conf_from_file(bs)
+        builder.updateConfiguration(bsconfig)
+        builder.generate(rtems_version)
+        builders.append(builder)
 
 def init(ctx):
     rtems.init(ctx, version = rtems_version, long_commands = True)
@@ -109,7 +110,6 @@ def options(opt):
                    help = "Select build sets to build. If set to a directory, all .py file in this directory will be used.")
 
 def bsp_configure(conf, arch_bsp):
-    create_builder(conf);
     conf.check(header_name = "dlfcn.h", features = "c")
     conf.check(header_name = "rtems/pci.h", features = "c", mandatory = False)
     if not rtems.check_posix(conf):