Skip to content

Commit 660d60b

Browse files
committed
llext: fix Windows builds
Under windows the Python interpreter has to be called explicitly. Without it an attempt to execute a Python script fails silently. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 7c6828c commit 660d60b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

scripts/xtensa-build-zephyr.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import gzip
4040
import dataclasses
4141
import concurrent.futures as concurrent
42+
import re
4243

4344
from west import configuration as west_config
4445

@@ -943,7 +944,8 @@ def install_lib(sof_lib_dir, abs_build_dir, platform_wconfig):
943944
llext_input = entry_path / (llext_base + '.llext')
944945
llext_output = entry_path / (llext_file + '.ri')
945946

946-
sign_cmd = [platform_wconfig.get("rimage.path"), "-o", str(llext_output),
947+
rimage_cmd = re.sub(r"[\"']", "", platform_wconfig.get("rimage.path"))
948+
sign_cmd = [rimage_cmd, "-o", str(llext_output),
947949
"-e", "-c", str(rimage_cfg),
948950
"-k", str(signing_key), "-l", "-r",
949951
str(llext_input)]

zephyr/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function(sof_llext_build module)
9090
get_target_property(proc_out_file ${module} pkg_input)
9191
add_llext_command(TARGET ${module}
9292
POST_BUILD
93-
COMMAND ${SOF_BASE}scripts/llext_link_helper.py
93+
COMMAND ${PYTHON_EXECUTABLE} ${SOF_BASE}scripts/llext_link_helper.py
9494
--text-addr="${SOF_LLEXT_TEXT_ADDR}" -f ${proc_in_file} ${CMAKE_C_COMPILER} --
9595
-o ${proc_out_file} ${EXTRA_LINKER_PARAMS}
9696
$<TARGET_OBJECTS:${module}_llext_lib>

0 commit comments

Comments
 (0)