ia64/xen-unstable

changeset 11900:8551487a637d

Don't use $(LINK.o), as it doesn't pick up -m32/-m64 from $(CFLAGS).

Signed-off-by: John Levon <john.levon@sun.com>
author kfraser@localhost.localdomain
date Thu Oct 19 15:13:09 2006 +0100 (2006-10-19)
parents 9278ab46ebf2
children d088aec406c0
files tools/xcutils/Makefile tools/xenstore/Makefile
line diff
     1.1 --- a/tools/xcutils/Makefile	Thu Oct 19 14:56:02 2006 +0100
     1.2 +++ b/tools/xcutils/Makefile	Thu Oct 19 15:13:09 2006 +0100
     1.3 @@ -33,7 +33,7 @@ all: build
     1.4  build: $(PROGRAMS)
     1.5  
     1.6  $(PROGRAMS): %: %.o
     1.7 -	$(LINK.o) $^ $(LDLIBS) -o $@
     1.8 +	$(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
     1.9  
    1.10  .PHONY: install
    1.11  install: build
     2.1 --- a/tools/xenstore/Makefile	Thu Oct 19 14:56:02 2006 +0100
     2.2 +++ b/tools/xenstore/Makefile	Thu Oct 19 15:13:09 2006 +0100
     2.3 @@ -36,31 +36,31 @@ XENSTORED_OBJS += $(XENSTORED_OBJS_y)
     2.4  all: libxenstore.so libxenstore.a xenstored $(CLIENTS) xs_tdb_dump xenstore-control xenstore-ls
     2.5  
     2.6  test_interleaved_transactions: test_interleaved_transactions.o
     2.7 -	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o $@
     2.8 +	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o $@
     2.9  
    2.10  .PHONY: testcode
    2.11  testcode: xs_test xenstored_test xs_random
    2.12  
    2.13  xenstored: $(XENSTORED_OBJS)
    2.14 -	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@
    2.15 +	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@
    2.16  
    2.17  $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so
    2.18 -	$(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
    2.19 +	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
    2.20  
    2.21  $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c
    2.22  	$(COMPILE.c) -DCLIENT_$(*F) -o $@ $<
    2.23  
    2.24  xenstore-control: xenstore_control.o libxenstore.so
    2.25 -	$(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
    2.26 +	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
    2.27  
    2.28  xenstore-ls: xsls.o libxenstore.so
    2.29 -	$(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
    2.30 +	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@
    2.31  
    2.32  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
    2.33 -	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
    2.34 +	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
    2.35  
    2.36  xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
    2.37 -	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
    2.38 +	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
    2.39  
    2.40  xs_test xs_random xs_stress xs_crashme: LDFLAGS+=-lpthread
    2.41  xs_test: xs_test.o xs_lib.o utils.o