# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 7ed73735fd30038abbd2d4ba55ac7541eb35a5e4
# Parent 88e6bd5e2b5439f97e1d50a8724103c619aeaadf
This is a small patch that makes a cross compiler successfully compile
the sources under the tools directory. This patch became necessary
after qemu-dm is updated to a newer version.
Signed-off-by: Hiroya INAKOSHI <inakoshi.hiroya@xxxxxxxxxxxxxx>
---
tools/blktap/lib/Makefile | 2 +-
tools/libaio/src/Makefile | 7 +++++--
tools/xenstore/Makefile | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff -r 88e6bd5e2b54 -r 7ed73735fd30 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Wed Aug 16 11:36:13 2006 +0100
+++ b/tools/blktap/lib/Makefile Wed Aug 16 11:53:37 2006 +0100
@@ -61,7 +61,7 @@ libblktap.a: $(OBJS)
-o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
ln -sf libblktap.so.$(MAJOR) libblktap.so
- ar rc $@ libblktap.so
+ $(AR) rc $@ libblktap.so
.PHONY: TAGS all build clean install libblktap
diff -r 88e6bd5e2b54 -r 7ed73735fd30 tools/libaio/src/Makefile
--- a/tools/libaio/src/Makefile Wed Aug 16 11:36:13 2006 +0100
+++ b/tools/libaio/src/Makefile Wed Aug 16 11:53:37 2006 +0100
@@ -1,3 +1,6 @@ prefix=/usr
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
prefix=/usr
includedir=$(prefix)/include
libdir=$(prefix)/lib
@@ -44,8 +47,8 @@ libaio_sobjs := $(patsubst %.c,%.os,$(li
libaio.a: $(libaio_objs)
rm -f libaio.a
- ar r libaio.a $^
- ranlib libaio.a
+ $(AR) r libaio.a $^
+ $(RANLIB) libaio.a
$(libname): $(libaio_sobjs) libaio.map
$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map
-Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
diff -r 88e6bd5e2b54 -r 7ed73735fd30 tools/xenstore/Makefile
--- a/tools/xenstore/Makefile Wed Aug 16 11:36:13 2006 +0100
+++ b/tools/xenstore/Makefile Wed Aug 16 11:53:37 2006 +0100
@@ -98,7 +98,7 @@ libxenstore.so.$(MAJOR).$(MINOR): xs.opi
$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so.$(MAJOR)
-shared -o $@ $^ -lpthread
libxenstore.a: xs.o xs_lib.o
- ar rcs libxenstore.a $^
+ $(AR) rcs libxenstore.a $^
.PHONY: clean
clean: testsuite-clean
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home