Skip to content

xtensa-build-zephyr: fix incremental build, pass CMAKE_ARGS only once #5003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Nov 18, 2021
Merged

xtensa-build-zephyr: fix incremental build, pass CMAKE_ARGS only once #5003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions scripts/xtensa-build-zephyr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,21 @@ build_all()
# west can get lost in symbolic links and then
# show a confusing error.
/bin/pwd
set -x
west build --build-dir "$bdir" --board "$PLAT_CONFIG" \
if test -d "$bdir"; then
test -z "${CMAKE_ARGS+defined}" ||
die 'Cannot re-define CMAKE_ARGS, you must delete %s first\n' \
"$(pwd)/$bdir"
# --board is cached and not required again either but unlike
# CMAKE_ARGS this _not_ does force CMake to re-run and passing
# a different board by mistake is very nicely caught by west.
set -x
west build --build-dir "$bdir" --board "$PLAT_CONFIG"
else
set -x
west build --build-dir "$bdir" --board "$PLAT_CONFIG" \
zephyr/samples/subsys/audio/sof \
-- "${CMAKE_ARGS[@]}"
fi

# This should ideally be part of
# sof/zephyr/CMakeLists.txt but due to the way
Expand Down