1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/llvm.py b/scripts/llvm.py
index 3a4954c..7c3fb85 100644
--- a/scripts/llvm.py
+++ b/scripts/llvm.py
@@ -4,7 +4,6 @@ import os
 from sys import argv
 from sys import exit
 
-from modules.llvm import build_llvm
 from modules.llvm import LLVMBuildConfig
 from modules.llvm import LLVMSubproject
 from modules.llvm import LLVMSourceConfig
@@ -101,11 +100,6 @@ def configure_build(args):
     llvm_worktree_root = args.sources
     sourceConfig = LLVMSourceConfig(proj, llvm_worktree_root, args.dry)
 
-    buildConfig = LLVMBuildConfig(sourceConfig, args.build)
-
-    if args.defs:
-        args.defs = ["-D{}".format(v) for v in args.defs]
-
     if args.dry:
         consumer = CommandPrinter()
     else:
@@ -113,8 +107,13 @@ def configure_build(args):
             os.makedirs(args.build)
         consumer = CommandRunner()
 
+    buildConfig = LLVMBuildConfig(sourceConfig, args.build, consumer)
+
+    if args.defs:
+        args.defs = ["-D{}".format(v) for v in args.defs]
+
     try:
-        buildConfig.cmake(consumer, args.defs, args.generator)
+        buildConfig.cmake(args.defs, args.generator)
     except RuntimeError as exc:
         die("Failed to configure {} because:\n{}".format(args.build, str(exc)))
 
@@ -129,7 +128,7 @@ def run_build(args):
         consumer = CommandRunner()
 
     try:
-        build_llvm(consumer, args.build, args.flags)
+        LLVMBuildConfig(None, args.build, consumer).build(args.flags)
     except RuntimeError as exc:
         die("Failed to build {} because:\n{}".format(args.build, str(exc)))