Skip to content

Commit 932ca92

Browse files
committed
rebuild-testbench.sh: switch to new SOF_CC_BASE variable
It was awkward to depend on ZEPHYR_TOOLCHAIN_VARIANT when the testbench has absolutely nothing to do with it. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 7a8c1b7 commit 932ca92

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

scripts/rebuild-testbench.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,8 @@ setup_xtensa_tools_build()
7575
test -n "${XTENSA_CORE}" ||
7676
die "Illegal platform $BUILD_PLATFORM, no XTENSA_CORE found.\n"
7777

78-
# Zephyr is not part of the testbench at all but let's play nice and
79-
# align with that naming convention to keep things simple.
80-
case "${ZEPHYR_TOOLCHAIN_VARIANT}" in
81-
xcc) COMPILER=xt-xcc;;
82-
xt-clang) COMPILER=xt-clang;;
83-
*) die 'Unknown or undefined ZEPHYR_TOOLCHAIN_VARIANT=%s\n' \
84-
"${ZEPHYR_TOOLCHAIN_VARIANT}";;
85-
esac
78+
# This (local?) variable should probably be inlined
79+
COMPILER=xt-"$SOF_CC_BASE"
8680

8781
install_bin=install/tools/$TOOLCHAIN_VER/XtensaTools/bin
8882
tools_bin=$XTENSA_TOOLS_ROOT/$install_bin

scripts/set_xtensa_params.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ case "$platform" in
145145
;;
146146
esac
147147

148-
# Pre-zephyr "XTOS" build
148+
# Pre-zephyr "XTOS" build, testbench,...
149149
case "$platform" in
150-
none_yet)
150+
mtl|lnl)
151151
SOF_CC_BASE='clang';;
152152
*)
153153
SOF_CC_BASE='xcc';;
154154
esac
155155

156-
# For Zephyr unit tests, testbench,...
156+
# For Zephyr unit tests
157157
case "$platform" in
158158
imx8*|mtl|lnl)
159159
ZEPHYR_TOOLCHAIN_VARIANT='xt-clang';;

0 commit comments

Comments
 (0)