From 73a2f50c3d481340623117efb9251d2c7b347258 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 26 May 2022 14:33:40 +0200 Subject: [PATCH 1/4] Link variant folder as object files --- tools/platformio-build-esp32.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/platformio-build-esp32.py b/tools/platformio-build-esp32.py index fe6775d543d..0d9aa625229 100644 --- a/tools/platformio-build-esp32.py +++ b/tools/platformio-build-esp32.py @@ -357,10 +357,10 @@ 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() From 5f227adf758525cfde69a940b7e9cabec5d8d419 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 26 May 2022 14:34:26 +0200 Subject: [PATCH 2/4] Link variant folder as object files --- tools/platformio-build-esp32c3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/platformio-build-esp32c3.py b/tools/platformio-build-esp32c3.py index 1557a0806c7..5b80cfecfb4 100644 --- a/tools/platformio-build-esp32c3.py +++ b/tools/platformio-build-esp32c3.py @@ -350,10 +350,10 @@ 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() From d625b3aab21ff5cbf2d0c81ff9c55bd8054c7894 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 26 May 2022 14:34:54 +0200 Subject: [PATCH 3/4] Link variant folder as object files --- tools/platformio-build-esp32s2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/platformio-build-esp32s2.py b/tools/platformio-build-esp32s2.py index 3aff44ad516..0deadd45cee 100644 --- a/tools/platformio-build-esp32s2.py +++ b/tools/platformio-build-esp32s2.py @@ -352,10 +352,10 @@ 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() From 71acff79348b64de0856c6daef64a0af5200d688 Mon Sep 17 00:00:00 2001 From: Maximilian Gerhardt Date: Thu, 26 May 2022 14:35:25 +0200 Subject: [PATCH 4/4] Link variant folder as object files --- tools/platformio-build-esp32s3.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/platformio-build-esp32s3.py b/tools/platformio-build-esp32s3.py index 1733393ee11..897761c6d4c 100644 --- a/tools/platformio-build-esp32s3.py +++ b/tools/platformio-build-esp32s3.py @@ -369,10 +369,10 @@ 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()