diff --git a/configure-build b/configure-build
index 4e9f2d5..e9ef0da 100755
--- a/configure-build
+++ b/configure-build
@@ -57,4 +57,9 @@ cmake \
 	-DCMAKE_SYSTEM_NAME=Rosetta \
 	-DCMAKE_TOOLCHAIN_FILE=$source_dir/arch/$target_arch/Platform/Rosetta.cmake
 
+python3 \
+	$source_dir/util/merge-compiledb.py \
+	compile_commands.json \
+	toolchain/compile_commands.json
+
 popd > /dev/null
diff --git a/util/merge-compiledb.py b/util/merge-compiledb.py
new file mode 100755
index 0000000..b3802c8
--- /dev/null
+++ b/util/merge-compiledb.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+import sys
+import json
+
+if len(sys.argv) < 3:
+    print('USAGE: {} <dest-file> [src-files...]'.format(sys.argv[0]))
+    exit(-1)
+
+dest_path = sys.argv[1]
+src_paths = sys.argv[2:]
+
+dest = open(dest_path, 'r')
+dest_data = json.load(dest)
+dest.close()
+
+for src_path in src_paths:
+    src = open(src_path, 'r')
+    src_data = json.load(src)
+    dest_data += src_data
+    src.close()
+
+dest = open(dest_path, 'w')
+json.dump(dest_data, dest, indent=4)
+dest.close()
diff --git a/util/sysroot-tool.py b/util/sysroot-tool.py
old mode 100644
new mode 100755