build: Extra compile flags from command line

Additional flags can now be passed to the compiler via environment
variables, e.g., CFLAGS_EXTRA in the case of C:

    make CFLAGS_EXTRA="-DSOME_MACRO=0"

Update the documentation as well.

Signed-off-by: Hugo Lefeuvre <hugo.lefeuvre@manchester.ac.uk>
Reviewed-by: Simon Kuenzer <simon.kuenzer@neclab.eu>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Pull-Request: #255

diff --git a/doc/guides/developers-app.rst b/doc/guides/developers-app.rst
index fea5ecb8ddce8088974285ed22475056a50628a3..eec2eeb0132858d7e626ccadabf31c1c35ffa843 100644 (file)
--- a/doc/guides/developers-app.rst
+++ b/doc/guides/developers-app.rst
@@ -657,6 +657,13 @@ below: ::
   print-vars             - prints all the variables currently defined in Makefile
   make V=0|1             - 0 => quiet build (default), 1 => verbose build
 
+Additional flags can be passed to the compiler via environment variables, e.g.,
+``CFLAGS_EXTRA`` in the case of C:
+
+.. code-block:: bash
+
+  make CFLAGS_EXTRA="-DSOME_MACRO=0"
+
 
 ============================
 Patch Creation

diff --git a/support/build/Makefile.rules b/support/build/Makefile.rules
index aa12d6b34a299b9ecf917018a32d69cc7c0e6dd4..6487229fb9a5e6d68df672e732d0b4a8b3bafed5 100644 (file)
--- a/support/build/Makefile.rules
+++ b/support/build/Makefile.rules
@@ -474,7 +474,7 @@ $(4): $(2) | preprocess
                       $$($(call vprefix_lib,$(1),ASINCLUDES)) $$($(call vprefix_lib,$(1),ASINCLUDES-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
                       $$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
-                      $$(ASFLAGS) $$(ASFLAGS-y) \
+                      $$(ASFLAGS) $$(ASFLAGS-y) $$(ASFLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),ASFLAGS)) $$($(call vprefix_lib,$(1),ASFLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
                       $(5) \
@@ -501,7 +501,7 @@ $(4): $(2) | preprocess
                       $$($(call vprefix_lib,$(1),ASINCLUDES)) $$($(call vprefix_lib,$(1),ASINCLUDES-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
                       $$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
-                      $$(ASFLAGS) $$(ASFLAGS-y) \
+                      $$(ASFLAGS) $$(ASFLAGS-y) $$(ASFLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),ASFLAGS)) $$($(call vprefix_lib,$(1),ASFLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
                       $(5) \
@@ -526,7 +526,7 @@ $(4): $(2) | preprocess
                       $$($(call vprefix_lib,$(1),CINCLUDES)) $$($(call vprefix_lib,$(1),CINCLUDES-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
                       $$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
-                      $$(CFLAGS) $$(CFLAGS-y) \
+                      $$(CFLAGS) $$(CFLAGS-y) $$(CFLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),CFLAGS)) $$($(call vprefix_lib,$(1),CFLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
                       $(5) \
@@ -550,7 +550,7 @@ $(4): $(2) | preprocess
                       $$($(call vprefix_lib,$(1),CXXINCLUDES)) $$($(call vprefix_lib,$(1),CXXINCLUDES-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
                       $$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
-                      $$(CXXFLAGS) $$(CXXFLAGS-y) \
+                      $$(CXXFLAGS) $$(CXXFLAGS-y) $$(CXXFLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),CXXFLAGS)) $$($(call vprefix_lib,$(1),CXXFLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
                       $(5) \
@@ -582,7 +582,7 @@ $(4): $(2) | preprocess
                       $$($(call vprefix_lib,$(1),GOCINCLUDES)) $$($(call vprefix_lib,$(1),GOCINCLUDES-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
                       $$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
-                      $$(GOCFLAGS) $$(GOCFLAGS-y) \
+                      $$(GOCFLAGS) $$(GOCFLAGS-y) $$(GOCFLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),GOCFLAGS)) $$($(call vprefix_lib,$(1),GOCFLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
                       $(5) \
@@ -614,7 +614,7 @@ $(4): $(2) | preprocess
                       $$($(call vprefix_lib,$(1),ASINCLUDES)) $$($(call vprefix_lib,$(1),ASINCLUDES-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
                       $$(ARCHFLAGS) $$(ARCHFLAGS-y) \
-                      $$(ASFLAGS) $$(ASFLAGS-y) \
+                      $$(ASFLAGS) $$(ASFLAGS-y) $$(ASFLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),ASFLAGS)) $$($(call vprefix_lib,$(1),ASFLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
                       $(5) \
@@ -718,7 +718,7 @@ $(3): $(2) | prepare
                $(M4)  $$(M4INCLUDES) $$(M4INCLUDES-y) \
                       $$($(call vprefix_lib,$(1),M4INCLUDES)) $$($(call vprefix_lib,$(1),M4INCLUDES-y)) \
                       $$($(call vprefix_src,$(1),$(2),,M4INCLUDES)) $$($(call vprefix_src,$(1),$(2),,M4INCLUDES-y)) \
-                      $$(M4FLAGS) $$(M4FLAGS-y) \
+                      $$(M4FLAGS) $$(M4FLAGS-y) $$(M4FLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),M4FLAGS)) $$($(call vprefix_lib,$(1),M4FLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),,M4FLAGS)) $$($(call vprefix_src,$(1),$(2),,M4FLAGS-y)) \
                       $(4) \