From ba686313d496ee25db69803ef7e5bfb1e07eb841 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 6 Oct 2006 12:27:58 +0900 Subject: build-cpp-and-ld-flags [BUILD] CPPFLAGS, CFLAGS and LDFLAGS fixes * Set internal CPPFLAGS as EXTRA_CPPFLAGS, CFLAGS as EXTRA_CFLAGS, and LDFLAGS as EXTRA_LDFLAGS - Don't overwrite CPPFLAGS, LDLFAGS or CFLAGS from the environment - They are irrelevant for BUILD_CC - When cross-compiling for a ppc64 host on a non-ppc64 host, EXTRA_CFLAGS, which is included in BUILD_CPPFLAGS contains -mcall-aixdesc, which does not work on i386 at least * Use LDFLAGS when linking kexec - Append rather than overwrite in purgatory/Makefile The purpose of these changes is three-fold. * CPPFLAGS, CFLAGS and LDFLAGS from the environment really ought to be honoured. For one thing; * Without these changes, the confgiure taget in the toplevel makefile can't work * Without these changes, cross compiling does not work - well, I can't work out how to get it to work anyway. Signed-Off-By: Simon Horman --- kexec_test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kexec_test') diff --git a/kexec_test/Makefile b/kexec_test/Makefile index 3e932d5..70542de 100644 --- a/kexec_test/Makefile +++ b/kexec_test/Makefile @@ -15,11 +15,11 @@ include $(KEXEC_TEST_DEPS) $(KEXEC_TEST_S_DEPS): $(OBJDIR)/%.d: %.S mkdir -p $(@D) - $(CC) -m32 $(CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@ + $(CC) -m32 $(CFLAGS) $(EXTRA_CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@ $(KEXEC_TEST_S_TEMPS): $(OBJDIR)/%.s: %.S mkdir -p $(@D) - $(CPP) $(CPPFLAGS) -DRELOC=$(RELOC) $< > $@ + $(CPP) $(CPPFLAGS) $(EXTRA_CPPFLAGS) -DRELOC=$(RELOC) $< > $@ $(KEXEC_TEST_S_OBJS): $(OBJDIR)/%.o: $(OBJDIR)/%.s mkdir -p $(@D) -- cgit