aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-09-06 23:45:13 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-09-06 23:45:13 -0700
commit778d5af7a543c4a16dafab0dfa9346baa40dd30a (patch)
treebfda1d7bedf568613d875f87ec3871ee32a0e7a3 /Makefile
parentff1fbc22d221ae87fa24b80eaf1996421e936955 (diff)
parent0292ae9d3cb57a685f00d0acdac70900ccac0a16 (diff)
downloadhistory-778d5af7a543c4a16dafab0dfa9346baa40dd30a.tar.gz
Merge bk://linux-sam.bkbits.net/kbuild
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8de47cdd377256..ea83721623e83d 100644
--- a/Makefile
+++ b/Makefile
@@ -344,8 +344,8 @@ endif
include arch/$(ARCH)/Makefile
# Let architecture Makefiles change CPPFLAGS if needed
-CFLAGS += $(CPPFLAGS) $(CFLAGS)
-AFLAGS += $(CPPFLAGS) $(AFLAGS)
+CFLAGS := $(CPPFLAGS) $(CFLAGS)
+AFLAGS := $(CPPFLAGS) $(AFLAGS)
core-y += kernel/ mm/ fs/ ipc/ security/ crypto/