Resolved an issue where the `COMPILATIONDB_INCLUDE_TOOLCHAIN` setting was not correctly applying to private libraries // Resolve #4762

HISTORY.rst

@@ -17,6 +17,11 @@ Unlock the true potential of embedded software development with
 PlatformIO's collaborative ecosystem, embracing declarative principles,
 test-driven methodologies, and modern toolchains for unrivaled success.
 
+6.1.12 (2023-??-??)
+~~~~~~~~~~~~~~~~~~~
+
+* Resolved an issue where the ``COMPILATIONDB_INCLUDE_TOOLCHAIN`` setting was not correctly applying to private libraries (`issue #4762 <https://github.com/platformio/platformio-core/issues/4762>`_)
+
 6.1.11 (2023-08-31)
 ~~~~~~~~~~~~~~~~~~~
 

platformio/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (6, 1, "12a1")
+VERSION = (6, 1, "12a2")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

platformio/builder/tools/piobuild.py

@@ -129,9 +129,7 @@ def ProcessProgramDeps(env):
     env.ProcessCompileDbToolchainOption()
 
 
-def ProcessCompileDbToolchainOption(
-    env,
-):  # separated out to selectively add to lib build step
+def ProcessCompileDbToolchainOption(env):
     if "compiledb" in COMMAND_LINE_TARGETS:
         # Resolve absolute path of toolchain
         for cmd in ("CC", "CXX", "AS"):

platformio/builder/tools/piolib.py

@@ -477,7 +477,6 @@ class LibBuilderBase:
         self.is_built = True
 
         self.env.PrependUnique(CPPPATH=self.get_include_dirs())
-
         self.env.ProcessCompileDbToolchainOption()
 
         if self.lib_ldf_mode == "off":