diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 17:17:57 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-17 17:17:57 +0100 |
| commit | d61113c5c7c2bceb9bab3dc97c51aa150ee8bf2f (patch) | |
| tree | 9c11179d05ff2488215b96f0af9f3d3f058b2094 /tools/xenstore/Makefile | |
| parent | 7ffd47fbf69a7a972c1f7fd27757b86e3d710643 (diff) | |
| download | xen-d61113c5c7c2bceb9bab3dc97c51aa150ee8bf2f.tar.gz xen-d61113c5c7c2bceb9bab3dc97c51aa150ee8bf2f.tar.bz2 xen-d61113c5c7c2bceb9bab3dc97c51aa150ee8bf2f.zip | |
[SOLARIS] On Solaris, GCC is configured to use Sun's LD. Fix the build to use
the correct flags, and link against libsocket where necessary.
Signed-off-by: John Levon <john.levon@sun.com>
Diffstat (limited to 'tools/xenstore/Makefile')
| -rw-r--r-- | tools/xenstore/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index ff5e45fe2c..4507b72240 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -41,19 +41,19 @@ test_interleaved_transactions: test_interleaved_transactions.o testcode: xs_test xenstored_test xs_random xenstored: $(XENSTORED_OBJS) - $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl -o $@ + $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl $(SOCKET_LIBS) -o $@ $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so - $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o $@ + $(LINK.o) $< $(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 -o $@ + $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore $(SOCKET_LIBS) -o $@ xenstore-ls: xsls.o libxenstore.so - $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -L. -lxenstore -o $@ + $(LINK.o) $< $(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 $@ @@ -90,7 +90,7 @@ libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR) ln -sf $< $@ libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenstore.so.$(MAJOR) -shared -o $@ $^ -lpthread + $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lpthread libxenstore.a: xs.o xs_lib.o $(AR) rcs libxenstore.a $^ |