Skip to content

Commit eba36c2

Browse files
nikomatsakisbrson
authored andcommitted
---
yaml --- r: 6101 b: refs/heads/master c: 8011e3f h: refs/heads/master i: 6099: c9e4cbb v: v3
1 parent 6fc8de4 commit eba36c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2402
-63
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 020cd360e1e4406c3dae93004b45104a2324d3c7
2+
refs/heads/master: 8011e3fabb38e5bbc40038b540459595cce7a995

trunk/mk/libuv/mac/Makefile renamed to trunk/mk/libuv/ia32/mac/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
MAKEFLAGS=-r
88

99
# The source directory tree.
10-
srcdir := ../../..
10+
srcdir := ../../../..
1111

1212
# The name of the builddir.
1313
builddir_name ?= out
@@ -344,7 +344,7 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
344344
endif
345345

346346
quiet_cmd_regen_makefile = ACTION Regenerating $@
347-
cmd_regen_makefile = ./src/rt/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/mac" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/rt/libuv/uv.gyp
347+
cmd_regen_makefile = ./src/rt/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/ia32/mac" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/rt/libuv/uv.gyp
348348
#Makefile: $(srcdir)/src/rt/libuv/uv.gyp
349349
# $(call do_cmd,regen_makefile)
350350

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
# This file is generated by gyp; do not edit.
2+
3+
TOOLSET := target
4+
TARGET := run-tests
5+
DEFS_Default := '-D_GNU_SOURCE'
6+
7+
# Flags passed to all source files.
8+
CFLAGS_Default := -fasm-blocks \
9+
-mpascal-strings \
10+
-Os \
11+
-gdwarf-2 \
12+
-arch i386
13+
14+
# Flags passed to only C files.
15+
CFLAGS_C_Default :=
16+
17+
# Flags passed to only C++ files.
18+
CFLAGS_CC_Default :=
19+
20+
# Flags passed to only ObjC files.
21+
CFLAGS_OBJC_Default :=
22+
23+
# Flags passed to only ObjC++ files.
24+
CFLAGS_OBJCC_Default :=
25+
26+
INCS_Default := -I$(srcdir)/src/rt/libuv/include
27+
28+
OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/echo-server.o \
29+
$(obj).target/$(TARGET)/src/rt/libuv/test/run-tests.o \
30+
$(obj).target/$(TARGET)/src/rt/libuv/test/runner.o \
31+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-async.o \
32+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-callback-stack.o \
33+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-connection-fail.o \
34+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-delayed-accept.o \
35+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-fail-always.o \
36+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-fs.o \
37+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-fs-event.o \
38+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-get-currentexe.o \
39+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-getaddrinfo.o \
40+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-gethostbyname.o \
41+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-getsockname.o \
42+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-hrtime.o \
43+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
44+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
45+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
46+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
47+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
48+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
49+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
50+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
51+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-bind-error.o \
52+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-bind6-error.o \
53+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-close.o \
54+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
55+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
56+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
57+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer-again.o \
58+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer.o \
59+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tty.o \
60+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-udp-dgram-too-big.o \
61+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-udp-ipv6.o \
62+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-udp-send-and-recv.o \
63+
$(obj).target/$(TARGET)/src/rt/libuv/test/runner-unix.o
64+
65+
# Add to the list of files we specially track dependencies for.
66+
all_deps += $(OBJS)
67+
68+
# Make sure our dependencies are built before any of us.
69+
$(OBJS): | $(builddir)/libuv.a
70+
71+
# CFLAGS et al overrides must be target-local.
72+
# See "Target-specific Variable Values" in the GNU Make manual.
73+
$(OBJS): TOOLSET := $(TOOLSET)
74+
$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
75+
$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
76+
$(OBJS): GYP_OBJCFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) $(CFLAGS_OBJC_$(BUILDTYPE))
77+
$(OBJS): GYP_OBJCXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE)) $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) $(CFLAGS_OBJCC_$(BUILDTYPE))
78+
79+
# Suffix rules, putting all outputs into $(obj).
80+
81+
$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
82+
@$(call do_cmd,cc,1)
83+
84+
# Try building from generated source, too.
85+
86+
$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
87+
@$(call do_cmd,cc,1)
88+
89+
$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
90+
@$(call do_cmd,cc,1)
91+
92+
# End of this set of suffix rules
93+
### Rules for final target.
94+
LDFLAGS_Default := -arch i386 \
95+
-L$(builddir)
96+
97+
LIBS := -framework Carbon \
98+
-framework CoreServices
99+
100+
$(builddir)/run-tests: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
101+
$(builddir)/run-tests: LIBS := $(LIBS)
102+
$(builddir)/run-tests: LD_INPUTS := $(OBJS) $(builddir)/libuv.a
103+
$(builddir)/run-tests: TOOLSET := $(TOOLSET)
104+
$(builddir)/run-tests: $(OBJS) $(builddir)/libuv.a FORCE_DO_CMD
105+
$(call do_cmd,link)
106+
107+
all_deps += $(builddir)/run-tests
108+
# Add target alias
109+
.PHONY: run-tests
110+
run-tests: $(builddir)/run-tests
111+
112+
# Add executable to "all" target.
113+
.PHONY: all
114+
all: $(builddir)/run-tests
115+
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is generated by gyp; do not edit.
22

3-
export builddir_name ?= mk/libuv/win/./src/rt/libuv/out
3+
export builddir_name ?= mk/libuv/ia32/mac/./src/rt/libuv/out
44
.PHONY: all
55
all:
66
$(MAKE) -C ../../.. uv run-tests run-benchmarks

trunk/mk/libuv/unix/Makefile renamed to trunk/mk/libuv/ia32/unix/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
MAKEFLAGS=-r
88

99
# The source directory tree.
10-
srcdir := ../../..
10+
srcdir := ../../../..
1111

1212
# The name of the builddir.
1313
builddir_name ?= out
@@ -322,7 +322,7 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
322322
endif
323323

324324
quiet_cmd_regen_makefile = ACTION Regenerating $@
325-
cmd_regen_makefile = ./src/rt/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/unix" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=linux" src/rt/libuv/uv.gyp
325+
cmd_regen_makefile = ./src/rt/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/ia32/unix" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=linux" src/rt/libuv/uv.gyp
326326
#Makefile: $(srcdir)/src/rt/libuv/uv.gyp
327327
# $(call do_cmd,regen_makefile)
328328

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is generated by gyp; do not edit.
22

3-
export builddir_name ?= mk/libuv/unix/./src/rt/libuv/out
3+
export builddir_name ?= mk/libuv/ia32/unix/./src/rt/libuv/out
44
.PHONY: all
55
all:
66
$(MAKE) -C ../../.. uv run-tests run-benchmarks

trunk/mk/libuv/win/Makefile renamed to trunk/mk/libuv/ia32/win/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
MAKEFLAGS=-r
88

99
# The source directory tree.
10-
srcdir := ../../..
10+
srcdir := ../../../..
1111

1212
# The name of the builddir.
1313
builddir_name ?= out
@@ -322,7 +322,7 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
322322
endif
323323

324324
quiet_cmd_regen_makefile = ACTION Regenerating $@
325-
cmd_regen_makefile = ./src/rt/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/win" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=win" src/rt/libuv/uv.gyp
325+
cmd_regen_makefile = ./src/rt/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/ia32/win" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=win" src/rt/libuv/uv.gyp
326326
#Makefile: $(srcdir)/src/rt/libuv/uv.gyp
327327
# $(call do_cmd,regen_makefile)
328328

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is generated by gyp; do not edit.
22

3-
export builddir_name ?= mk/libuv/mac/./src/rt/libuv/out
3+
export builddir_name ?= mk/libuv/ia32/win/./src/rt/libuv/out
44
.PHONY: all
55
all:
66
$(MAKE) -C ../../.. uv run-tests run-benchmarks

0 commit comments

Comments
 (0)