Use the same libuv output directory on Mac and Linux.

This commit is contained in:
Bob Nystrom
2015-08-27 07:55:12 -07:00
parent 4d613fc394
commit 0ae59be11a
3 changed files with 3 additions and 4 deletions

View File

@ -4,7 +4,7 @@
# Executables are built to bin/. Libraries are built to lib/.
LIBUV := build/libuv/build/Release/libuv.a
LIBUV := build/libuv/out/Release/libuv.a
# A normal, optimized release build for the current CPU architecture.
release: $(LIBUV)

View File

@ -83,6 +83,7 @@ def build_libuv_mac():
"xcodebuild",
# Build a 32-bit + 64-bit universal binary:
"ARCHS=i386 x86_64", "ONLY_ACTIVE_ARCH=NO",
"BUILD_DIR=out",
"-project", LIB_UV_DIR + "/uv.xcodeproj",
"-configuration", "Release",
"-target", "All"

View File

@ -92,11 +92,9 @@ endif
# shared library.
ifneq (,$(findstring darwin,$(OS)))
SHARED_EXT := dylib
LIBUV_BUILD := build
else
SHARED_LIB_FLAGS := -Wl,-soname,$@.so
SHARED_EXT := so
LIBUV_BUILD := out
# On Linux we need to explicitly link to these for libuv.
LIBUV_LIBS := -lpthread -lrt
@ -110,7 +108,7 @@ VM_OBJECTS := $(addprefix $(BUILD_DIR)/vm/, $(notdir $(VM_SOURCES:.c=.o)))
TEST_OBJECTS := $(patsubst test/api/%.c, $(BUILD_DIR)/test/%.o, $(TEST_SOURCES))
LIBUV_DIR := build/libuv
LIBUV := $(LIBUV_DIR)/$(LIBUV_BUILD)/Release/libuv.a
LIBUV := $(LIBUV_DIR)/out/Release/libuv.a
# Flags needed to compile source files for the CLI, including the modules and
# API tests.