|
@@ -4,6 +4,11 @@ ccflags-y += $(EXTRA_CFLAGS)
|
|
cppflags-y += $(EXTRA_CPPFLAGS)
|
|
cppflags-y += $(EXTRA_CPPFLAGS)
|
|
ldflags-y += $(EXTRA_LDFLAGS)
|
|
ldflags-y += $(EXTRA_LDFLAGS)
|
|
|
|
|
|
|
|
+#
|
|
|
|
+# flags that take effect in sub directories
|
|
|
|
+export KBUILD_SUBDIR_ASFLAGS := $(KBUILD_SUBDIR_ASFLAGS) $(subdir-asflags-y)
|
|
|
|
+export KBUILD_SUBDIR_CCFLAGS := $(KBUILD_SUBDIR_CCFLAGS) $(subdir-ccflags-y)
|
|
|
|
+
|
|
# Figure out what we need to build from the various variables
|
|
# Figure out what we need to build from the various variables
|
|
# ===========================================================================
|
|
# ===========================================================================
|
|
|
|
|
|
@@ -104,10 +109,10 @@ else
|
|
debug_flags =
|
|
debug_flags =
|
|
endif
|
|
endif
|
|
|
|
|
|
-orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \
|
|
|
|
|
|
+orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \
|
|
$(ccflags-y) $(CFLAGS_$(basetarget).o)
|
|
$(ccflags-y) $(CFLAGS_$(basetarget).o)
|
|
_c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags))
|
|
_c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags))
|
|
-_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) \
|
|
|
|
|
|
+_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \
|
|
$(asflags-y) $(AFLAGS_$(basetarget).o)
|
|
$(asflags-y) $(AFLAGS_$(basetarget).o)
|
|
_cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))
|
|
_cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))
|
|
|
|
|