Commit:     f15cf5151c3ecfe4073fb4478f686cb396bc2b17
Parent:     4f40c05528f9d612057a3dd382008a54179f8919
Author:     Jeff Dike <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 5 14:50:59 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Nov 5 15:12:32 2007 -0800

    uml: correctly strip kernel defines from userspace CFLAGS
    KERNEL_DEFINES needs whitespace trimmed, otherwise the whitespace crunching
    done by make fools the patsubst which is used to remove KERNEL_DEFINES from
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Cc: Sam Ravnborg <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/um/Makefile |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 82c2ac4..768a5d1 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -70,9 +70,12 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 # in KBUILD_CFLAGS.  Otherwise, it would cause ld to complain about the two 
 # errnos.
 # These apply to kernelspace only.
+# strip leading and trailing whitespace to make the USER_CFLAGS removal of 
+# defines more robust
-KERNEL_DEFINES = -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
-       -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES)
+KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask 
+                        -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
 KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to