summaryrefslogtreecommitdiff
path: root/util_lib
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2006-10-06 12:27:58 +0900
committerSimon Horman <horms@verge.net.au>2006-10-06 12:46:16 +0900
commitba686313d496ee25db69803ef7e5bfb1e07eb841 (patch)
tree91ba8a16a03ed3710c16a01c9cf413d57983c371 /util_lib
parent103c946e39eb9dd57ccbda20ac12ccb01f883c17 (diff)
downloadkexec-tools-ba686313d496ee25db69803ef7e5bfb1e07eb841.tar.gz
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 <horms@verge.net.au>
Diffstat (limited to 'util_lib')
-rw-r--r--util_lib/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/util_lib/Makefile b/util_lib/Makefile
index 4e1a01d..84679a1 100644
--- a/util_lib/Makefile
+++ b/util_lib/Makefile
@@ -11,11 +11,11 @@ include $(UTIL_LIB_DEPS)
$(UTIL_LIB_DEPS): $(OBJDIR)/%.d: %.c
$(MKDIR) -p $(@D)
- $(CC) $(CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@
$(UTIL_LIB_OBJS): $(OBJDIR)/%.o: %.c $(OBJDIR)/%.d
$(MKDIR) -p $(@D)
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
$(UTIL_LIB): $(UTIL_LIB_OBJS)
$(MKDIR) -p $(@D)