Merge pull request #10414 from ronald-cron-arm/deprecate-make-follow-up

Make deprecation follow-up

scripts/code_size_compare.py

@@ -190,7 +190,7 @@ class CodeSizeBuildInfo: # pylint: disable=too-few-public-methods
         self.compiler = size_dist_info.compiler
         self.opt_level = size_dist_info.opt_level
 
-        self.make_cmd = ['make', '-j', 'lib']
+        self.make_cmd = ['make', '-f', './scripts/legacy.make', '-j', 'lib']
 
         self.host_arch = host_arch
         self.logger = logger
@@ -287,7 +287,7 @@ class CodeSizeCalculator:
         """
         self.repo_path = "."
         self.git_command = "git"
-        self.make_clean = 'make clean'
+        self.make_clean = 'make -f ./scripts/legacy.make clean'
 
         self.git_rev = git_rev
         self.pre_make_cmd = pre_make_cmd
@@ -319,6 +319,10 @@ class CodeSizeCalculator:
                  git_worktree_path, self.git_rev], cwd=self.repo_path,
                 stderr=subprocess.STDOUT
             )
+            subprocess.check_output(
+                [self.git_command, "submodule", "update", "--init", "--recursive"],
+                cwd=git_worktree_path, stderr=subprocess.STDOUT
+            )
 
         return git_worktree_path
 

scripts/footprint.sh

@@ -85,9 +85,9 @@ doit()
         scripts/config.py --force -f ${CRYPTO_CONFIG_H} set MBEDTLS_PSA_DRIVER_GET_ENTROPY || true
     } >/dev/null 2>&1
 
-    make clean >/dev/null
+    make -f scripts/legacy.make clean >/dev/null
     CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld \
-        CFLAGS="$ARMGCC_FLAGS" make lib >/dev/null
+        CFLAGS="$ARMGCC_FLAGS" make -f scripts/legacy.make lib >/dev/null
 
     OUT="size-${NAME}.txt"
     arm-none-eabi-size -t library/libmbed*.a > "$OUT"

scripts/memory.sh

@@ -59,8 +59,8 @@ do_config()
 
     printf "    Executable size... "
 
-    make clean
-    CFLAGS=$CFLAGS_EXEC make OFLAGS=-Os lib >/dev/null 2>&1
+    make -f ./scripts/legacy.make clean
+    CFLAGS=$CFLAGS_EXEC make -f ./scripts/legacy.make OFLAGS=-Os lib >/dev/null 2>&1
     cd programs
     CFLAGS=$CFLAGS_EXEC make OFLAGS=-Os ssl/$CLIENT >/dev/null
     strip ssl/$CLIENT
@@ -69,8 +69,8 @@ do_config()
 
     printf "    Peak ram usage... "
 
-    make clean
-    CFLAGS=$CFLAGS_MEM make OFLAGS=-Os lib >/dev/null 2>&1
+    make -f ./scripts/legacy.make clean
+    CFLAGS=$CFLAGS_MEM make -f ./scripts/legacy.make OFLAGS=-Os lib >/dev/null 2>&1
     cd programs
     CFLAGS=$CFLAGS_MEM make OFLAGS=-Os ssl/$CLIENT >/dev/null
     cd ..
@@ -103,8 +103,8 @@ rm -f massif.out.*
 
 printf "building server... "
 
-make clean
-make lib >/dev/null 2>&1
+make -f ./scripts/legacy.make clean
+make -f ./scripts/legacy.make lib >/dev/null 2>&1
 (cd programs && make ssl/ssl_server2) >/dev/null
 cp programs/ssl/ssl_server2 .
 
@@ -123,7 +123,7 @@ do_config   "suite-b" \
 # cleanup
 
 mv $CONFIG_BAK $CONFIG_H
-make clean
+make -f scripts/legacy.make clean
 rm ssl_server2
 
 exit $FAILED

tests/scripts/basic-build-test.sh

@@ -71,11 +71,10 @@ echo
 # Step 1 - Make and instrumented build for code coverage
 export CFLAGS=' --coverage -g3 -O0 '
 export LDFLAGS=' --coverage'
-make clean
+make -f scripts/legacy.make clean
 cp "$CONFIG_H" "$CONFIG_BAK"
 scripts/config.py full
-make
-
+make -f scripts/legacy.make
 
 # Step 2 - Execute the tests
 TEST_OUTPUT=out_${PPID}
@@ -119,7 +118,7 @@ echo
 # Step 3 - Process the coverage report
 cd ..
 {
-    make lcov
+    make -f scripts/legacy.make lcov
     echo SUCCESS
 } | tee tests/cov-$TEST_OUTPUT
 
@@ -237,7 +236,7 @@ rm -f "tests/basic-build-test-$$.ok"
     touch "basic-build-test-$$.ok"
 } | tee coverage-summary.txt
 
-make clean
+make -f scripts/legacy.make clean
 
 if [ -f "$CONFIG_BAK" ]; then
     mv "$CONFIG_BAK" "$CONFIG_H"