Skip to content

Commit 20612a4

Browse files
mcsprhasenradball
authored andcommitted
Fix CPPDEFINES loop (esp8266#8744)
Expect that (key, value) can be (key,)
1 parent 1321c72 commit 20612a4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/platformio-build.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,15 @@ def scons_patched_match_splitext(path, suffixes=None):
196196
NONOSDK_PREFIX = "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_"
197197
for define in env["CPPDEFINES"]:
198198
if isinstance(define, (tuple, list)):
199-
define, _ = define
199+
define, *_ = define
200200
if define.startswith(NONOSDK_PREFIX):
201201
for version in NONOSDK_VERSIONS:
202202
name, _ = version
203203
if define.endswith(name):
204204
nonosdk_version = version
205205

206206
NONOSDK_LIBPATH=join(FRAMEWORK_DIR, "tools", "sdk", "lib", nonosdk_version[1])
207-
assert(isdir(NONOSDK_LIBPATH))
207+
assert isdir(NONOSDK_LIBPATH)
208208

209209
env.Append(
210210
CPPDEFINES=[(nonosdk_version[1], 1)],
@@ -336,7 +336,7 @@ def scons_patched_match_splitext(path, suffixes=None):
336336
for flag in env["CPPDEFINES"]:
337337
define = flag
338338
if isinstance(flag, (tuple, list)):
339-
define, _ = flag
339+
define, *_ = flag
340340
if define.startswith("MMU_"):
341341
mmu_flags.append(flag)
342342
# PIO_FRAMEWORK_ARDUINO_MMU_CACHE32_IRAM32 (default)

0 commit comments

Comments
 (0)