Skip to content

Commit 193603d

Browse files
agattidpgeorge
authored andcommitted
tools/ci.sh: Clean the correct MPY files when batch compiling.
This commit fixes a small yet harmless issue that occurs when invoking `ci_native_mpy_modules_build` on a persistent environment, as only X64 MPY files would be removed by the cleaning process. Now the correct architecture is passed at all times when cleaning before building a natmod for a particular architecture, forcing a full build of all files to better simulate the CI environment (where there's no state persisted between runs for this step). Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
1 parent e8c9224 commit 193603d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

tools/ci.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,14 +526,14 @@ function ci_native_mpy_modules_build {
526526
fi
527527
for natmod in deflate features1 features3 features4 framebuf heapq random re
528528
do
529-
make -C examples/natmod/$natmod clean
529+
make -C examples/natmod/$natmod ARCH=$arch clean
530530
make -C examples/natmod/$natmod ARCH=$arch
531531
done
532532

533533
# features2 requires soft-float on armv7m, rv32imc, and xtensa. On armv6m
534534
# the compiler generates absolute relocations in the object file
535535
# referencing soft-float functions, which is not supported at the moment.
536-
make -C examples/natmod/features2 clean
536+
make -C examples/natmod/features2 ARCH=$arch clean
537537
if [ $arch = "rv32imc" ] || [ $arch = "armv7m" ] || [ $arch = "xtensa" ]; then
538538
make -C examples/natmod/features2 ARCH=$arch MICROPY_FLOAT_IMPL=float
539539
elif [ $arch != "armv6m" ]; then
@@ -542,7 +542,7 @@ function ci_native_mpy_modules_build {
542542

543543
# btree requires thread local storage support on rv32imc.
544544
if [ $arch != "rv32imc" ]; then
545-
make -C examples/natmod/btree clean
545+
make -C examples/natmod/btree ARCH=$arch clean
546546
make -C examples/natmod/btree ARCH=$arch
547547
fi
548548
}

0 commit comments

Comments
 (0)