From 7ab27ddf9dfc11d3421c13385e328d1651514d96 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 16 Nov 2023 18:54:45 +0200 Subject: [PATCH] Resolved an issue where the ``COMPILATIONDB_INCLUDE_TOOLCHAIN`` setting was not correctly applying to private libraries // Resolve #4762 --- HISTORY.rst | 5 +++++ docs | 2 +- platformio/__init__.py | 2 +- platformio/builder/tools/piobuild.py | 4 +--- platformio/builder/tools/piolib.py | 1 - 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 6a5b2a0b..18f5a313 100644 --- a/HISTORY.rst +++ b/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 `_) + 6.1.11 (2023-08-31) ~~~~~~~~~~~~~~~~~~~ diff --git a/docs b/docs index 2b5c9e4b..07f966a6 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 2b5c9e4bda50a0992f8e7628bc6ef5bf25b883ea +Subproject commit 07f966a65c2392cae4bcfc1b0e4f9f8a85b831d0 diff --git a/platformio/__init__.py b/platformio/__init__.py index 2ea56425..9a8932bc 100644 --- a/platformio/__init__.py +++ b/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" diff --git a/platformio/builder/tools/piobuild.py b/platformio/builder/tools/piobuild.py index f3f583c5..047090c7 100644 --- a/platformio/builder/tools/piobuild.py +++ b/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"): diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index a6833680..70b0811c 100644 --- a/platformio/builder/tools/piolib.py +++ b/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":