From 389fe3568d14db7929006e8cb658e821919eff27 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 14 May 2008 21:30:29 -0400 Subject: [PATCH] --- yaml --- r: 100549 b: refs/heads/master c: 656ee82cc855027b2e994ad218519b09fa652cc1 h: refs/heads/master i: 100547: 256913a7624913c1ccd6393016b49e11295ee604 v: v3 --- [refs] | 2 +- trunk/scripts/Makefile.lib | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1161eb30644..95ea69f35ea4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e491d14f2506b218d678935c25a7027b79178b1 +refs/heads/master: 656ee82cc855027b2e994ad218519b09fa652cc1 diff --git a/trunk/scripts/Makefile.lib b/trunk/scripts/Makefile.lib index 8e440233c27d..ea48b82a3707 100644 --- a/trunk/scripts/Makefile.lib +++ b/trunk/scripts/Makefile.lib @@ -96,7 +96,8 @@ basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))" modname_flags = $(if $(filter 1,$(words $(modname))),\ -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))") -_c_flags = $(KBUILD_CFLAGS) $(ccflags-y) $(CFLAGS_$(basetarget).o) +orig_c_flags = $(KBUILD_CFLAGS) $(ccflags-y) $(CFLAGS_$(basetarget).o) +_c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) _a_flags = $(KBUILD_AFLAGS) $(asflags-y) $(AFLAGS_$(basetarget).o) _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))