luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: rename OS to PLATFORM

Browse Source 
Rename the OS make variable to PLATFORM, it conflicts with the OS env
var. That is, running `make` when the OS env var is set, may cause
spurious build breakage.

Fixes #737.
This commit is contained in:
Ben Noordhuis 2013-03-17 00:12:42 +01:00
parent b45a74fab3
commit a9740c9bc4
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.mk
View File

@ -18,17 +18,17 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE. # IN THE SOFTWARE.
OS ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"') PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
CPPFLAGS += -I$(SRCDIR)/include -I$(SRCDIR)/include/uv-private CPPFLAGS += -I$(SRCDIR)/include -I$(SRCDIR)/include/uv-private
ifeq (darwin,$(OS)) ifeq (darwin,$(PLATFORM))
SOEXT = dylib SOEXT = dylib
else else
SOEXT = so SOEXT = so
endif endif
ifneq (,$(findstring mingw,$(OS))) ifneq (,$(findstring mingw,$(PLATFORM)))
include $(SRCDIR)/config-mingw.mk include $(SRCDIR)/config-mingw.mk
else else
include $(SRCDIR)/config-unix.mk include $(SRCDIR)/config-unix.mk

20
config-unix.mk
View File

@ -54,7 +54,7 @@ OBJS += src/fs-poll.o
OBJS += src/uv-common.o OBJS += src/uv-common.o
OBJS += src/inet.o OBJS += src/inet.o
ifeq (sunos,$(OS)) ifeq (sunos,$(PLATFORM))
CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
LDFLAGS+=-lkstat -lnsl -lsendfile -lsocket LDFLAGS+=-lkstat -lnsl -lsendfile -lsocket
# Library dependencies are not transitive. # Library dependencies are not transitive.
@ -62,13 +62,13 @@ RUNNER_LDFLAGS += $(LDFLAGS)
OBJS += src/unix/sunos.o OBJS += src/unix/sunos.o
endif endif
ifeq (aix,$(OS)) ifeq (aix,$(PLATFORM))
CPPFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500 CPPFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500
LDFLAGS+= -lperfstat LDFLAGS+= -lperfstat
OBJS += src/unix/aix.o OBJS += src/unix/aix.o
endif endif
ifeq (darwin,$(OS)) ifeq (darwin,$(PLATFORM))
CPPFLAGS += -D_DARWIN_USE_64_BIT_INODE=1 CPPFLAGS += -D_DARWIN_USE_64_BIT_INODE=1
LDFLAGS += -framework Foundation \ LDFLAGS += -framework Foundation \
-framework CoreServices \ -framework CoreServices \
@ -82,7 +82,7 @@ OBJS += src/unix/proctitle.o
OBJS += src/unix/darwin-proctitle.o OBJS += src/unix/darwin-proctitle.o
endif endif
ifeq (linux,$(OS)) ifeq (linux,$(PLATFORM))
CSTDFLAG += -D_GNU_SOURCE CSTDFLAG += -D_GNU_SOURCE
LDFLAGS+=-ldl -lrt LDFLAGS+=-ldl -lrt
RUNNER_CFLAGS += -D_GNU_SOURCE RUNNER_CFLAGS += -D_GNU_SOURCE
@ -92,38 +92,38 @@ OBJS += src/unix/linux-core.o \
src/unix/proctitle.o src/unix/proctitle.o
endif endif
ifeq (freebsd,$(OS)) ifeq (freebsd,$(PLATFORM))
LDFLAGS+=-lkvm LDFLAGS+=-lkvm
OBJS += src/unix/freebsd.o OBJS += src/unix/freebsd.o
OBJS += src/unix/kqueue.o OBJS += src/unix/kqueue.o
endif endif
ifeq (dragonfly,$(OS)) ifeq (dragonfly,$(PLATFORM))
LDFLAGS+=-lkvm LDFLAGS+=-lkvm
OBJS += src/unix/freebsd.o OBJS += src/unix/freebsd.o
OBJS += src/unix/kqueue.o OBJS += src/unix/kqueue.o
endif endif
ifeq (netbsd,$(OS)) ifeq (netbsd,$(PLATFORM))
LDFLAGS+=-lkvm LDFLAGS+=-lkvm
OBJS += src/unix/netbsd.o OBJS += src/unix/netbsd.o
OBJS += src/unix/kqueue.o OBJS += src/unix/kqueue.o
endif endif
ifeq (openbsd,$(OS)) ifeq (openbsd,$(PLATFORM))
LDFLAGS+=-lkvm LDFLAGS+=-lkvm
OBJS += src/unix/openbsd.o OBJS += src/unix/openbsd.o
OBJS += src/unix/kqueue.o OBJS += src/unix/kqueue.o
endif endif
ifneq (,$(findstring cygwin,$(OS))) ifneq (,$(findstring cygwin,$(PLATFORM)))
# We drop the --std=c89, it hides CLOCK_MONOTONIC on cygwin # We drop the --std=c89, it hides CLOCK_MONOTONIC on cygwin
CSTDFLAG = -D_GNU_SOURCE CSTDFLAG = -D_GNU_SOURCE
LDFLAGS+= LDFLAGS+=
OBJS += src/unix/cygwin.o OBJS += src/unix/cygwin.o
endif endif
ifeq (sunos,$(OS)) ifeq (sunos,$(PLATFORM))
RUNNER_LDFLAGS += -pthreads RUNNER_LDFLAGS += -pthreads
else else
RUNNER_LDFLAGS += -pthread RUNNER_LDFLAGS += -pthread