From 54f64c9d86c102c935d5db71d3b79977fb67abb1 Mon Sep 17 00:00:00 2001
From: valeros <valeros08@gmail.com>
Date: Tue, 23 Apr 2024 17:49:06 +0300
Subject: [PATCH] Fix toolchain path in ULP build script

---
 builder/frameworks/ulp.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/builder/frameworks/ulp.py b/builder/frameworks/ulp.py
index 8cc9221..1a66c2b 100644
--- a/builder/frameworks/ulp.py
+++ b/builder/frameworks/ulp.py
@@ -34,11 +34,14 @@ ULP_BUILD_DIR = os.path.join(
 def prepare_ulp_env_vars(env):
     ulp_env.PrependENVPath("IDF_PATH", FRAMEWORK_DIR)
 
+    toolchain_path = platform.get_package_dir(
+        "toolchain-xtensa-esp-elf"
+        if "arduino" not in env.subst("$PIOFRAMEWORK")
+        else "toolchain-xtensa-%s" % idf_variant
+    )
+
     additional_packages = [
-        os.path.join(
-            platform.get_package_dir("toolchain-xtensa-%s" % idf_variant),
-            "bin",
-        ),
+        toolchain_path,
         os.path.join(
             platform.get_package_dir("toolchain-esp32ulp"),
             "bin",