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/xenstat | |
| 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/xenstat')
| -rw-r--r-- | tools/xenstat/libxenstat/Makefile | 8 | ||||
| -rw-r--r-- | tools/xenstat/xentop/Makefile | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 214f50ba23..8cb77f17bc 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -30,7 +30,7 @@ LIB=src/libxenstat.a SHLIB=src/libxenstat.so.$(MAJOR).$(MINOR) SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so OBJECTS=src/xenstat.o -SONAME_FLAGS=-Wl,-soname -Wl,libxenstat.so.$(MAJOR) +SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) WARN_FLAGS=-Wall -Werror @@ -45,7 +45,7 @@ $(LIB): $(OBJECTS) $(RANLIB) $@ $(SHLIB): $(OBJECTS) - $(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_FLAGS) -shared -o $@ $(OBJECTS) \ + $(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_CFLAGS) -o $@ $(OBJECTS) \ -lxenstore -lxenctrl src/xenstat.o: src/xenstat.c src/xenstat.h @@ -97,7 +97,7 @@ $(PYSRC) $(PYMOD): bindings/swig/xenstat.i swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $< $(PYLIB): $(PYSRC) - $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) -shared -lxenstat -o $@ $< + $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_CFLAGS) -lxenstat -o $@ $< python-bindings: $(PYLIB) $(PYMOD) @@ -118,7 +118,7 @@ $(PERLSRC) $(PERLMOD): bindings/swig/xenstat.i swig -perl $(SWIG_FLAGS) -outdir $(@D) -o $(PERLSRC) $< $(PERLLIB): $(PERLSRC) - $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) -shared -lxenstat -o $@ $< + $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_CFLAGS) -lxenstat -o $@ $< .PHONY: perl-bindings perl-bindings: $(PERLLIB) $(PERLMOD) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index b1220b2d33..b97485f5d6 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -25,7 +25,7 @@ sbindir=$(prefix)/sbin CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) LDFLAGS += -L$(XEN_LIBXENSTAT) -LDLIBS += -lxenstat -lncurses +LDLIBS += -lxenstat -lncurses $(SOCKET_LIBS) .PHONY: all all: xentop |