diff --git a/prepare.py b/prepare.py
index 1f1a16227..b14456239 100755
--- a/prepare.py
+++ b/prepare.py
@@ -35,9 +35,9 @@ sys.dont_write_bytecode = True
 sys.path.insert(0, 'submodules/cmake-builder')
 try:
     import prepare
-except:
+except Exception as e:
     error(
-        "Could not find prepare module, probably missing submodules/cmake-builder? Try running:\ngit submodule update --init --recursive")
+        "Could not find prepare module: {}, probably missing submodules/cmake-builder? Try running:\ngit submodule update --init --recursive".format(e))
     exit(1)
 
 
@@ -544,10 +544,12 @@ def main(argv=None):
     if args.list_features:
         tmpdir = tempfile.mkdtemp(prefix="linphone-iphone")
         tmptarget = IOSarm64Target()
+        tmptarget.abs_cmake_dir = tmpdir
 
         option_regex = re.compile("ENABLE_(.*):(.*)=(.*)")
         option_list = [""]
-        for line in Popen(tmptarget.cmake_command("Debug", False, True, additional_args),
+        build_type = 'Debug' if args.debug else 'Release'
+        for line in Popen(tmptarget.cmake_command(build_type, False, True, additional_args),
                           cwd=tmpdir, shell=False, stdout=PIPE).stdout.readlines():
             match = option_regex.match(line)
             if match is not None:
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 5ff6590ab..015037369 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 5ff6590ab1b9e97bc97eadaa4f64353f266e2d9f
+Subproject commit 0150373697676183e6735d69620d6e7dc5545134