From bde2d643eca430b6cae3f1487eeba9a0c9732076 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Fri, 4 Aug 2023 15:40:31 +0300 Subject: [PATCH] Sync PlatformIO build scripts (#8488) Added special handling of the `ARDUINO_BUILD_CORE` macro required only for the core files --- tools/platformio-build.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/platformio-build.py b/tools/platformio-build.py index e3c7b50db..5b11c1a9b 100644 --- a/tools/platformio-build.py +++ b/tools/platformio-build.py @@ -172,6 +172,10 @@ SConscript( # Target: Build Core Library # +# Set -DARDUINO_CORE_BUILD only for the core library +corelib_env = env.Clone() +corelib_env.Append(CPPDEFINES=["ARDUINO_CORE_BUILD"]) + libs = [] variants_dir = join(FRAMEWORK_DIR, "variants") @@ -181,13 +185,14 @@ if "build.variants_dir" in board_config: if "build.variant" in board_config: env.Append(CPPPATH=[join(variants_dir, board_config.get("build.variant"))]) - env.BuildSources( + corelib_env.Append(CPPPATH=[join(variants_dir, board_config.get("build.variant"))]) + corelib_env.BuildSources( join("$BUILD_DIR", "FrameworkArduinoVariant"), join(variants_dir, board_config.get("build.variant")), ) libs.append( - env.BuildLibrary( + corelib_env.BuildLibrary( join("$BUILD_DIR", "FrameworkArduino"), join(FRAMEWORK_DIR, "cores", board_config.get("build.core")), )