From 3e8f7fe8d474fe990aea625fc2cd6db4d9e9c388 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Fri, 27 May 2022 12:35:32 +0200 Subject: [PATCH] PlatformIO: Fix linking to make initVariant() work (#6809) --- tools/platformio-build-esp32.py | 4 ++-- tools/platformio-build-esp32c3.py | 4 ++-- tools/platformio-build-esp32s2.py | 4 ++-- tools/platformio-build-esp32s3.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/platformio-build-esp32.py b/tools/platformio-build-esp32.py index 76cac086d..6c82fce96 100644 --- a/tools/platformio-build-esp32.py +++ b/tools/platformio-build-esp32.py @@ -356,10 +356,10 @@ if "build.variant" in env.BoardConfig(): join(variants_dir, env.BoardConfig().get("build.variant")) ] ) - libs.append(env.BuildLibrary( + env.BuildSources( join("$BUILD_DIR", "FrameworkArduinoVariant"), join(variants_dir, env.BoardConfig().get("build.variant")) - )) + ) envsafe = env.Clone() diff --git a/tools/platformio-build-esp32c3.py b/tools/platformio-build-esp32c3.py index 5b8028cbd..26a85a4a8 100644 --- a/tools/platformio-build-esp32c3.py +++ b/tools/platformio-build-esp32c3.py @@ -349,10 +349,10 @@ if "build.variant" in env.BoardConfig(): join(variants_dir, env.BoardConfig().get("build.variant")) ] ) - libs.append(env.BuildLibrary( + env.BuildSources( join("$BUILD_DIR", "FrameworkArduinoVariant"), join(variants_dir, env.BoardConfig().get("build.variant")) - )) + ) envsafe = env.Clone() diff --git a/tools/platformio-build-esp32s2.py b/tools/platformio-build-esp32s2.py index c46ad50f9..7fa190bc5 100644 --- a/tools/platformio-build-esp32s2.py +++ b/tools/platformio-build-esp32s2.py @@ -351,10 +351,10 @@ if "build.variant" in env.BoardConfig(): join(variants_dir, env.BoardConfig().get("build.variant")) ] ) - libs.append(env.BuildLibrary( + env.BuildSources( join("$BUILD_DIR", "FrameworkArduinoVariant"), join(variants_dir, env.BoardConfig().get("build.variant")) - )) + ) envsafe = env.Clone() diff --git a/tools/platformio-build-esp32s3.py b/tools/platformio-build-esp32s3.py index 97ac6c6bb..ca9d6b787 100644 --- a/tools/platformio-build-esp32s3.py +++ b/tools/platformio-build-esp32s3.py @@ -368,10 +368,10 @@ if "build.variant" in env.BoardConfig(): join(variants_dir, env.BoardConfig().get("build.variant")) ] ) - libs.append(env.BuildLibrary( + env.BuildSources( join("$BUILD_DIR", "FrameworkArduinoVariant"), join(variants_dir, env.BoardConfig().get("build.variant")) - )) + ) envsafe = env.Clone() -- GitLab