[Xen-changelog] [xen-unstable] Don't use $(LINK.o), as it doesn't pick up -m32/-m64 from $(CFLAGS).

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 8551487a637d5798601e86ce6563e9a8abaa2325
# Parent  9278ab46ebf2f45b4a64bbcb16a3c7abf3dcc275
Don't use $(LINK.o), as it doesn't pick up -m32/-m64 from $(CFLAGS).

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/xcutils/Makefile  |    2 +-
 tools/xenstore/Makefile |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff -r 9278ab46ebf2 -r 8551487a637d tools/xcutils/Makefile
--- a/tools/xcutils/Makefile    Thu Oct 19 14:56:02 2006 +0100
+++ b/tools/xcutils/Makefile    Thu Oct 19 15:13:09 2006 +0100
@@ -33,7 +33,7 @@ build: $(PROGRAMS)
 build: $(PROGRAMS)
 
 $(PROGRAMS): %: %.o
-       $(LINK.o) $^ $(LDLIBS) -o $@
+       $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
 
 .PHONY: install
 install: build
diff -r 9278ab46ebf2 -r 8551487a637d tools/xenstore/Makefile
--- a/tools/xenstore/Makefile   Thu Oct 19 14:56:02 2006 +0100
+++ b/tools/xenstore/Makefile   Thu Oct 19 15:13:09 2006 +0100
@@ -36,31 +36,31 @@ all: libxenstore.so libxenstore.a xensto
 all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump 
xenstore-control xenstore-ls
 
 test_interleaved_transactions: test_interleaved_transactions.o
-       $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o 
$@
 
 .PHONY: testcode
 testcode: xs_test xenstored_test xs_random
 
 xenstored: $(XENSTORED_OBJS)
-       $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl 
$(SOCKET_LIBS) -o $@
 
 $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so
-       $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore 
$(SOCKET_LIBS) -o $@
 
 $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c
        $(COMPILE.c) -DCLIENT_$(*F) -o $@ $<
 
 xenstore-control: xenstore_control.o libxenstore.so
-       $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore 
$(SOCKET_LIBS) -o $@
 
 xenstore-ls: xsls.o libxenstore.so
-       $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore 
$(SOCKET_LIBS) -o $@
 
 xenstored_test: xenstored_core_test.o xenstored_watch_test.o 
xenstored_domain_test.o xenstored_transaction_test.o xs_lib.o talloc_test.o 
fake_libxc.o utils.o tdb.o
-       $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
-       $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
+       $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 xs_test xs_random xs_stress xs_crashme: LDFLAGS+=-lpthread
 xs_test: xs_test.o xs_lib.o utils.o

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog