From: Jerone Y. <jy...@us...> - 2007-11-08 20:05:07
|
# HG changeset patch # User Jerone Young <jy...@us...> # Date 1194551969 21600 # Node ID c08b2667a95ecd85effb1d5f5d84e235f9e8d6cc # Parent d6fa0d16fa60ee5083877fec698b69cea840d0b0 Fix building of kvmctl This patch creates the make rule needed to for the linker to link libkvm archive and main.o object to compile kvmctl correctly. Also fixes order at which objects are seen when linking, so that they can link correctly. Signed-off-by: Jerone Young <jy...@us...> diff --git a/user/Makefile b/user/Makefile --- a/user/Makefile +++ b/user/Makefile @@ -31,6 +31,7 @@ kvmctl: LDFLAGS += -pthread -lrt kvmctl: LDFLAGS += -pthread -lrt kvmctl: $(kvmctl_objs) + $(CC) $(LDFLAGS) $^ -o $@ %.flat: %.o $(CC) $(CFLAGS) -nostdlib -o $@ -Wl,-T,flat.lds $^ diff --git a/user/config-x86-common.mak b/user/config-x86-common.mak --- a/user/config-x86-common.mak +++ b/user/config-x86-common.mak @@ -2,7 +2,7 @@ all: kvmctl test_cases -kvmctl_objs=../libkvm/libkvm.a main.o +kvmctl_objs= main.o ../libkvm/libkvm.a balloon_ctl: balloon_ctl.o |