diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2015-11-08 17:35:19 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-11-09 14:55:00 +0000 |
| commit | b40a51a1cde20250743b84c7a592f1a9942f4ed2 (patch) | |
| tree | 5ca6c405e993aa6fbe5ef0f432ade825e51a20cf | |
| parent | 2aa76b2616bcace1d668a879d834679dfa00dc8c (diff) | |
| download | kvmtool-b40a51a1cde20250743b84c7a592f1a9942f4ed2.tar.gz | |
kvmtool: Makefile: remove LDFLAGS from guest_init linking
Looking back at the HEAD from a few commits ago, it's obvious that
using the LDFLAGS variable for linking the guest_init binary was
rather pointless, as it was zeroed in the beginning and then never
set.
As guest_init is a rather special binary that does not cope well with
arbitrary linker flags, let's reinstantiate the previous state by
removing the LDFLAGS variable from those linking steps. This allows
LDFLAGS to be used for linking the actual kvmtool binary only and
helps to re-merge commit d0e2772b93a ("Makefile: allow overriding
CFLAGS on the command line").
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -385,13 +385,13 @@ ifneq ($(ARCH_PRE_INIT),) $(GUEST_PRE_INIT): $(ARCH_PRE_INIT) $(E) " LINK " $@ $(Q) $(CC) -s -nostdlib $(ARCH_PRE_INIT) -o $@ - $(Q) $(LD) $(LDFLAGS) -r -b binary -o guest/guest_pre_init.o $(GUEST_PRE_INIT) + $(Q) $(LD) -r -b binary -o guest/guest_pre_init.o $(GUEST_PRE_INIT) endif $(GUEST_INIT): guest/init.c $(E) " LINK " $@ $(Q) $(CC) $(GUEST_INIT_FLAGS) guest/init.c -o $@ - $(Q) $(LD) $(LDFLAGS) -r -b binary -o guest/guest_init.o $(GUEST_INIT) + $(Q) $(LD) -r -b binary -o guest/guest_init.o $(GUEST_INIT) %.s: %.c $(Q) $(CC) -o $@ -S $(CFLAGS) -fverbose-asm $< |