diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2008-03-19 17:29:07 +1100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-03-24 17:48:05 +0900 |
| commit | 7e6a90376d0c48753808befaa21b7851a7dcf274 (patch) | |
| tree | fddb53b93a1f63ef4121f0185e40da278687b069 /purgatory | |
| parent | 50c058f6ce074838ce9d23e25c527e5c1541e196 (diff) | |
| download | kexec-tools-7e6a90376d0c48753808befaa21b7851a7dcf274.tar.gz | |
Use separate CPPFLAGS and LDFLAGS for purgatory
Currently, CPPFLAGS and LDFLAGS can 'leak' into the purgatory build
from the main kexec/kexec object. Because of this, the purgatory
is build with -lz, but we may not have a zlib present for the
architecture of the purgatory object.
This change uses fresh CPPFLAGS and LDFLAGS for the purgatory object.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'purgatory')
| -rw-r--r-- | purgatory/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/purgatory/Makefile b/purgatory/Makefile index 6c747b1d..ac587196 100644 --- a/purgatory/Makefile +++ b/purgatory/Makefile @@ -49,11 +49,12 @@ $(PURGATORY): CFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ -Os -fno-builtin -ffreestanding \ -fno-zero-initialized-in-bss -$(PURGATORY): CPPFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +$(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ -I$(srcdir)/purgatory/include \ -I$(srcdir)/purgatory/arch/$(ARCH)/include \ + -I$(srcdir)/util_lib/include \ -I$(shell $(CC) -print-file-name=include) -$(PURGATORY): LDFLAGS+=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ +$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ -e purgatory_start -r |