Skip to content

Commit 9b9e7ad

Browse files
hlefunikraft-bot
authored andcommitted
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 <[email protected]> Reviewed-by: Simon Kuenzer <[email protected]> Tested-by: Unikraft CI <[email protected]> GitHub-Pull-Request: unikraft#255
1 parent 0143559 commit 9b9e7ad

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

doc/guides/developers-app.rst

+7
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,13 @@ below: ::
657657
print-vars - prints all the variables currently defined in Makefile
658658
make V=0|1 - 0 => quiet build (default), 1 => verbose build
659659

660+
Additional flags can be passed to the compiler via environment variables, e.g.,
661+
``CFLAGS_EXTRA`` in the case of C:
662+
663+
.. code-block:: bash
664+
665+
make CFLAGS_EXTRA="-DSOME_MACRO=0"
666+
660667
661668
============================
662669
Patch Creation

support/build/Makefile.rules

+7-7
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ $(4): $(2) | preprocess
474474
$$($(call vprefix_lib,$(1),ASINCLUDES)) $$($(call vprefix_lib,$(1),ASINCLUDES-y)) \
475475
$$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
476476
$$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
477-
$$(ASFLAGS) $$(ASFLAGS-y) \
477+
$$(ASFLAGS) $$(ASFLAGS-y) $$(ASFLAGS_EXTRA) \
478478
$$($(call vprefix_lib,$(1),ASFLAGS)) $$($(call vprefix_lib,$(1),ASFLAGS-y)) \
479479
$$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
480480
$(5) \
@@ -501,7 +501,7 @@ $(4): $(2) | preprocess
501501
$$($(call vprefix_lib,$(1),ASINCLUDES)) $$($(call vprefix_lib,$(1),ASINCLUDES-y)) \
502502
$$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
503503
$$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
504-
$$(ASFLAGS) $$(ASFLAGS-y) \
504+
$$(ASFLAGS) $$(ASFLAGS-y) $$(ASFLAGS_EXTRA) \
505505
$$($(call vprefix_lib,$(1),ASFLAGS)) $$($(call vprefix_lib,$(1),ASFLAGS-y)) \
506506
$$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
507507
$(5) \
@@ -526,7 +526,7 @@ $(4): $(2) | preprocess
526526
$$($(call vprefix_lib,$(1),CINCLUDES)) $$($(call vprefix_lib,$(1),CINCLUDES-y)) \
527527
$$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
528528
$$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
529-
$$(CFLAGS) $$(CFLAGS-y) \
529+
$$(CFLAGS) $$(CFLAGS-y) $$(CFLAGS_EXTRA) \
530530
$$($(call vprefix_lib,$(1),CFLAGS)) $$($(call vprefix_lib,$(1),CFLAGS-y)) \
531531
$$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
532532
$(5) \
@@ -550,7 +550,7 @@ $(4): $(2) | preprocess
550550
$$($(call vprefix_lib,$(1),CXXINCLUDES)) $$($(call vprefix_lib,$(1),CXXINCLUDES-y)) \
551551
$$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
552552
$$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
553-
$$(CXXFLAGS) $$(CXXFLAGS-y) \
553+
$$(CXXFLAGS) $$(CXXFLAGS-y) $$(CXXFLAGS_EXTRA) \
554554
$$($(call vprefix_lib,$(1),CXXFLAGS)) $$($(call vprefix_lib,$(1),CXXFLAGS-y)) \
555555
$$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
556556
$(5) \
@@ -582,7 +582,7 @@ $(4): $(2) | preprocess
582582
$$($(call vprefix_lib,$(1),GOCINCLUDES)) $$($(call vprefix_lib,$(1),GOCINCLUDES-y)) \
583583
$$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
584584
$$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
585-
$$(GOCFLAGS) $$(GOCFLAGS-y) \
585+
$$(GOCFLAGS) $$(GOCFLAGS-y) $$(GOCFLAGS_EXTRA) \
586586
$$($(call vprefix_lib,$(1),GOCFLAGS)) $$($(call vprefix_lib,$(1),GOCFLAGS-y)) \
587587
$$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
588588
$(5) \
@@ -614,7 +614,7 @@ $(4): $(2) | preprocess
614614
$$($(call vprefix_lib,$(1),ASINCLUDES)) $$($(call vprefix_lib,$(1),ASINCLUDES-y)) \
615615
$$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
616616
$$(ARCHFLAGS) $$(ARCHFLAGS-y) \
617-
$$(ASFLAGS) $$(ASFLAGS-y) \
617+
$$(ASFLAGS) $$(ASFLAGS-y) $$(ASFLAGS_EXTRA) \
618618
$$($(call vprefix_lib,$(1),ASFLAGS)) $$($(call vprefix_lib,$(1),ASFLAGS-y)) \
619619
$$($(call vprefix_src,$(1),$(2),$(3),FLAGS)) $$($(call vprefix_src,$(1),$(2),$(3),FLAGS-y)) \
620620
$(5) \
@@ -718,7 +718,7 @@ $(3): $(2) | prepare
718718
$(M4) $$(M4INCLUDES) $$(M4INCLUDES-y) \
719719
$$($(call vprefix_lib,$(1),M4INCLUDES)) $$($(call vprefix_lib,$(1),M4INCLUDES-y)) \
720720
$$($(call vprefix_src,$(1),$(2),,M4INCLUDES)) $$($(call vprefix_src,$(1),$(2),,M4INCLUDES-y)) \
721-
$$(M4FLAGS) $$(M4FLAGS-y) \
721+
$$(M4FLAGS) $$(M4FLAGS-y) $$(M4FLAGS_EXTRA) \
722722
$$($(call vprefix_lib,$(1),M4FLAGS)) $$($(call vprefix_lib,$(1),M4FLAGS-y)) \
723723
$$($(call vprefix_src,$(1),$(2),,M4FLAGS)) $$($(call vprefix_src,$(1),$(2),,M4FLAGS-y)) \
724724
$(4) \

0 commit comments

Comments
 (0)