diff options
Diffstat (limited to 'deps/uv/config-unix.mk')
| -rw-r--r-- | deps/uv/config-unix.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/deps/uv/config-unix.mk b/deps/uv/config-unix.mk index ae510a332d..347d9d7764 100644 --- a/deps/uv/config-unix.mk +++ b/deps/uv/config-unix.mk @@ -18,8 +18,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -OBJC ?= $(CC) - E= CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter CFLAGS += -g @@ -31,7 +29,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 RUNNER_SRC=test/runner-unix.c RUNNER_CFLAGS=$(CFLAGS) -I$(SRCDIR)/test -RUNNER_LDFLAGS=-L"$(CURDIR)" -luv -Xlinker -rpath -Xlinker "$(CURDIR)" +RUNNER_LDFLAGS=-L"$(CURDIR)" -luv HAVE_DTRACE= DTRACE_OBJS= @@ -66,7 +64,6 @@ HAVE_DTRACE=1 CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 LDFLAGS+=-lkstat -lnsl -lsendfile -lsocket # Library dependencies are not transitive. -RUNNER_LDFLAGS += $(LDFLAGS) OBJS += src/unix/sunos.o OBJS += src/unix/dtrace.o DTRACE_OBJS += src/unix/core.o @@ -89,8 +86,7 @@ endif CPPFLAGS += -D_DARWIN_USE_64_BIT_INODE=1 LDFLAGS += -framework Foundation \ -framework CoreServices \ - -framework ApplicationServices \ - -dynamiclib -install_name "@rpath/libuv.dylib" + -framework ApplicationServices SOEXT = dylib OBJS += src/unix/darwin.o OBJS += src/unix/kqueue.o @@ -153,12 +149,19 @@ CPPFLAGS += -Isrc/unix CFLAGS += -DHAVE_DTRACE endif +ifneq (darwin,$(PLATFORM)) +# Must correspond with UV_VERSION_MAJOR and UV_VERSION_MINOR in src/version.c +SO_LDFLAGS = -Wl,-soname,libuv.so.0.10 +endif + +RUNNER_LDFLAGS += $(LDFLAGS) + libuv.a: $(OBJS) $(AR) rcs $@ $^ libuv.$(SOEXT): override CFLAGS += -fPIC libuv.$(SOEXT): $(OBJS:%.o=%.pic.o) - $(CC) -shared -o $@ $^ $(LDFLAGS) + $(CC) -shared -o $@ $^ $(LDFLAGS) $(SO_LDFLAGS) include/uv-private/uv-unix.h: \ include/uv-private/uv-bsd.h \ @@ -184,9 +187,6 @@ test/%.o: test/%.c include/uv.h test/.buildstamp clean-platform: $(RM) test/run-{tests,benchmarks}.dSYM $(OBJS) $(OBJS:%.o=%.pic.o) src/unix/uv-dtrace.h -%.pic.o %.o: %.m - $(OBJC) $(CPPFLAGS) $(CFLAGS) -c $^ -o $@ - src/unix/uv-dtrace.h: src/unix/uv-dtrace.d dtrace -h -xnolibs -s $< -o $@ |