Skip to content

Commit 68ee121

Browse files
ivankravetsearlephilhower
authored andcommitted
Fix issue when build environment contains spaces (#6119)
1 parent 912c0db commit 68ee121

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tools/platformio-build.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,16 @@ def scons_patched_match_splitext(path, suffixes=None):
135135
ElfToBin=Builder(
136136
action=env.VerboseAction(" ".join([
137137
'"$PYTHONEXE"',
138-
'"%s"' % env.subst(join(FRAMEWORK_DIR, "tools", "elf2bin.py")),
139-
"--eboot", '"%s"' % env.subst(join(
140-
FRAMEWORK_DIR, "bootloaders", "eboot", "eboot.elf")),
141-
"--app", '"%s"' % "$SOURCE",
138+
'"%s"' % join(FRAMEWORK_DIR, "tools", "elf2bin.py"),
139+
"--eboot", '"%s"' % join(
140+
FRAMEWORK_DIR, "bootloaders", "eboot", "eboot.elf"),
141+
"--app", "$SOURCE",
142142
"--flash_mode", "$BOARD_FLASH_MODE",
143143
"--flash_freq", "${__get_board_f_flash(__env__)}",
144144
"--flash_size", "${__get_flash_size(__env__)}",
145-
"--path", '"%s"' % env.subst(join(
146-
platform.get_package_dir("toolchain-xtensa"), "bin")),
147-
"--out", '"$TARGET"'
145+
"--path", '"%s"' % join(
146+
platform.get_package_dir("toolchain-xtensa"), "bin"),
147+
"--out", "$TARGET"
148148
]), "Building $TARGET"),
149149
suffix=".bin"
150150
)

0 commit comments

Comments
 (0)