Skip to content

Commit e6f72de

Browse files
marc-hbranj063
authored andcommitted
zephyr/docker-build.sh: upgrade CMake to 3.21 or above
CMake 3.21 changed the order object files are passed the linker. This breaks build reproducibility. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 424da2c commit e6f72de

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

‎zephyr/docker-build.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ unset ZEPHYR_SDK_INSTALL_DIR
3636
ls -ld /opt/toolchains/zephyr-sdk-*
3737
ln -s /opt/toolchains/zephyr-sdk-*~/ ||true
3838

39+
# CMake v3.21 changed the order object files are passed to the linker.
40+
# This makes builds before that version not reproducible.
41+
# To save time don't install if recent enough.
42+
pip install 'cmake>=3.21'
43+
PATH="$HOME"/.local/bin:"$PATH"
44+
3945
iftest -e .west ||test -e zephyr;then
4046
init_update=''
4147
else

0 commit comments

Comments
 (0)