zmake: allow specifying EXTRA_CFLAGS

The Zephyr build system supports passing extra CFLAGS via CMake, which
is useful for experimenting with compiler options. Add an option to zmake
which allows this to be passed through when configuring a build.

BUG=b:223044986
TEST=EXTRA_CFLAGS is set in generated cmake configurations when used
BRANCH=none

Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Change-Id: I3fca24ada4cdcfe442d610c93ae7f60137764dfa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3535542
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

Author: tari

zephyr/zmake/README.md

@@ -35,7 +35,7 @@ Chromium OS's meta-build tool for Zephyr
 
 ### zmake configure
 
-**Usage:** `zmake configure [-h] [-b] [--test] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] (-a | --host-tests-only | project_name [project_name ...])`
+**Usage:** `zmake configure [-h] [-b] [--test] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] (-a | --host-tests-only | project_name [project_name ...])`
 
 #### Positional Arguments
 
@@ -56,12 +56,13 @@ Chromium OS's meta-build tool for Zephyr
 | `--allow-warnings` | Do not treat warnings as errors |
 | `-B BUILD_DIR`, `--build-dir BUILD_DIR` | Root build directory, project files will be in ${build_dir}/${project_name} |
 | `-c`, `--coverage` | Enable CONFIG_COVERAGE Kconfig. |
+| `--extra-cflags EXTRA_CFLAGS` | Additional CFLAGS to use for target builds |
 | `-a`, `--all` | Select all projects |
 | `--host-tests-only` | Select all test projects |
 
 ### zmake build
 
-**Usage:** `zmake build [-h] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] (-a | --host-tests-only | project_name [project_name ...])`
+**Usage:** `zmake build [-h] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] (-a | --host-tests-only | project_name [project_name ...])`
 
 #### Positional Arguments
 
@@ -80,6 +81,7 @@ Chromium OS's meta-build tool for Zephyr
 | `--allow-warnings` | Do not treat warnings as errors |
 | `-B BUILD_DIR`, `--build-dir BUILD_DIR` | Root build directory, project files will be in ${build_dir}/${project_name} |
 | `-c`, `--coverage` | Enable CONFIG_COVERAGE Kconfig. |
+| `--extra-cflags EXTRA_CFLAGS` | Additional CFLAGS to use for target builds |
 | `-a`, `--all` | Select all projects |
 | `--host-tests-only` | Select all test projects |
 
@@ -102,7 +104,7 @@ Chromium OS's meta-build tool for Zephyr
 
 ### zmake test
 
-**Usage:** `zmake test [-h] [--no-rebuild] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] (-a | --host-tests-only | project_name [project_name ...])`
+**Usage:** `zmake test [-h] [--no-rebuild] [-t TOOLCHAIN] [--bringup] [--clobber] [--allow-warnings] [-B BUILD_DIR] [-c] [--extra-cflags EXTRA_CFLAGS] (-a | --host-tests-only | project_name [project_name ...])`
 
 #### Positional Arguments
 
@@ -122,6 +124,7 @@ Chromium OS's meta-build tool for Zephyr
 | `--allow-warnings` | Do not treat warnings as errors |
 | `-B BUILD_DIR`, `--build-dir BUILD_DIR` | Root build directory, project files will be in ${build_dir}/${project_name} |
 | `-c`, `--coverage` | Enable CONFIG_COVERAGE Kconfig. |
+| `--extra-cflags EXTRA_CFLAGS` | Additional CFLAGS to use for target builds |
 | `-a`, `--all` | Select all projects |
 | `--host-tests-only` | Select all test projects |
 

zephyr/zmake/zmake/__main__.py

@@ -300,6 +300,10 @@ def add_common_configure_args(sub_parser: argparse.ArgumentParser):
         dest="coverage",
         help="Enable CONFIG_COVERAGE Kconfig.",
     )
+    sub_parser.add_argument(
+        "--extra-cflags",
+        help="Additional CFLAGS to use for target builds",
+    )
     group = sub_parser.add_mutually_exclusive_group(required=True)
     group.add_argument(
         "-a",

zephyr/zmake/zmake/zmake.py

@@ -225,6 +225,7 @@ def configure(
         allow_warnings=False,
         all_projects=False,
         host_tests_only=False,
+        extra_cflags=None,
     ):
         """Locate and configure the specified projects."""
         # Resolve build_dir if needed.
@@ -248,6 +249,7 @@ def configure(
                     bringup=bringup,
                     coverage=coverage,
                     allow_warnings=allow_warnings,
+                    extra_cflags=extra_cflags,
                 )
             )
             if self._sequential:
@@ -288,6 +290,7 @@ def build(
         allow_warnings=False,
         all_projects=False,
         host_tests_only=False,
+        extra_cflags=None,
     ):
         """Locate and build the specified projects."""
         return self.configure(
@@ -300,6 +303,7 @@ def build(
             allow_warnings=allow_warnings,
             all_projects=all_projects,
             host_tests_only=host_tests_only,
+            extra_cflags=extra_cflags,
             build_after_configure=True,
         )
 
@@ -314,6 +318,7 @@ def test(
         allow_warnings=False,
         all_projects=False,
         host_tests_only=False,
+        extra_cflags=None,
         no_rebuild=False,
     ):
         """Locate and build the specified projects."""
@@ -328,6 +333,7 @@ def test(
                 allow_warnings=allow_warnings,
                 all_projects=all_projects,
                 host_tests_only=host_tests_only,
+                extra_cflags=extra_cflags,
                 test_after_configure=True,
             )
         # Resolve build_dir if needed.
@@ -403,6 +409,7 @@ def _configure(
         bringup=False,
         coverage=False,
         allow_warnings=False,
+        extra_cflags=None,
     ):
         """Set up a build directory to later be built by "zmake build"."""
         # Resolve build_dir if needed.
@@ -460,6 +467,10 @@ def _configure(
             base_config |= zmake.build_config.BuildConfig(
                 cmake_defs={"ALLOW_WARNINGS": "ON"}
             )
+        if extra_cflags:
+            base_config |= zmake.build_config.BuildConfig(
+                cmake_defs={"EXTRA_CFLAGS": extra_cflags},
+            )
         if self.goma:
             base_config |= zmake.build_config.BuildConfig(
                 cmake_defs={