build: apply `LIBxxx_COMPFLAGS{,-y}` to C++ too

These flags were not being applied to C++ source files. Add them to
`buildrule_cxx`. Also reorder compiler flags to be in line with C flags.

Signed-off-by: Tu Dinh Ngoc <dinhngoc.tu@irit.fr>
Reviewed-by: Cezar Craciunoiu <cezar.craciunoiu@unikraft.io>
Approved-by: Simon Kuenzer <simon@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #845

diff --git a/support/build/Makefile.rules b/support/build/Makefile.rules
index 89820743ccf31822eb2c647f7b21a877f1d1a971..4c4f0306198711ca91e45b05b82df00a057aa971 100644 (file)
--- a/support/build/Makefile.rules
+++ b/support/build/Makefile.rules
@@ -576,9 +576,10 @@ define buildrule_cxx =
 $(4): $(2) | preprocess
        $(call build_cmd_fixdep,CXX,$(1),$(4),\
                $(CXX) $$(COMPFLAGS) $$(COMPFLAGS-y) \
-                      $$(CXXINCLUDES) $$(CXXINCLUDES-y) \
-                      $$($(call vprefix_lib,$(1),CXXINCLUDES)) $$($(call vprefix_lib,$(1),CXXINCLUDES-y)) \
+                      $$($(call vprefix_lib,$(1),COMPFLAGS)) $$($(call vprefix_lib,$(1),COMPFLAGS-y)) \
                       $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES)) $$($(call vprefix_src,$(1),$(2),$(3),INCLUDES-y)) \
+                      $$($(call vprefix_lib,$(1),CXXINCLUDES)) $$($(call vprefix_lib,$(1),CXXINCLUDES-y)) \
+                      $$(CXXINCLUDES) $$(CXXINCLUDES-y) \
                       $$($(call vprefix_glb,$(3),ARCHFLAGS)) $$($(call vprefix_glb,$(3),ARCHFLAGS-y)) \
                       $$(CXXFLAGS) $$(CXXFLAGS-y) $$(CXXFLAGS_EXTRA) \
                       $$($(call vprefix_lib,$(1),CXXFLAGS)) $$($(call vprefix_lib,$(1),CXXFLAGS-y)) \