Skip to content

Commit 7359c7f

Browse files
ericktbrson
erickt
authored and
brson
committed
---
yaml --- r: 6206 b: refs/heads/master c: ab26558 h: refs/heads/master v: v3
1 parent 7fcac9c commit 7359c7f

Some content is hidden

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

67 files changed

+4337
-1802
lines changed

‎[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 1c87b9708c89c95e26e6fc7e676422bc329d165b
2+
refs/heads/master: ab265586eb6d2b87843fc6ad1ad1809c92c8d8f7

‎trunk/.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "src/llvm"]
22
path = src/llvm
33
url = git://github.com/brson/llvm.git
4+
[submodule "src/libuv"]
5+
path = src/libuv
6+
url = git://github.com/joyent/libuv

‎trunk/Makefile.in

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@
4848

4949
include config.mk
5050
OUR_MKFILES := Makefile config.mk $(wildcard $(CFG_SRC_DIR)/mk/*.mk)
51-
3RDPARTY_MKFILES := $(CFG_SRC_DIR)/src/rt/libuv/Makefile \
52-
$(wildcard $(CFG_SRC_DIR)/src/rt/libuv/*.mk)
51+
3RDPARTY_MKFILES := $(CFG_SRC_DIR)/src/libuv/Makefile \
52+
$(wildcard $(CFG_SRC_DIR)/src/libuv/*.mk)
5353
GEN_MKFILES := $(wildcard $(CFG_SRC_DIR)/mk/libuv/*/*/*) \
54-
$(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*) \
55-
$(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*) \
56-
$(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*)
54+
$(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/libuv/*) \
55+
$(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/libuv/*) \
56+
$(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/libuv/*)
5757

5858
MKFILES := $(OUR_MKFILES) $(3RDPARTY_MKFILES) $(GEN_MKFILES)
5959

‎trunk/mk/clean.mk

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ clean-misc:
2828
$(Q)rm -f $(GENERATED)
2929
$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
3030
$(Q)rm -f rt/$(CFG_RUNTIME)
31-
$(Q)rm -f rt/libuv/uv.a
32-
$(Q)rm -Rf $(wildcard rt/libuv/src/*/*)
33-
$(Q)rm -f $(wildcard rt/libuv/src/*.o)
31+
$(Q)rm -f libuv/uv.a
32+
$(Q)rm -Rf $(wildcard libuv/src/*/*)
33+
$(Q)rm -f $(wildcard libuv/src/*.o)
3434
$(Q)rm -f test/run_pass_stage2.rc test/run_pass_stage2_driver.rs
3535
$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
3636
$(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext)))
@@ -44,7 +44,7 @@ clean-misc:
4444
aux cp fn ky log pdf html pg toc tp vr cps, \
4545
$(wildcard doc/*.$(ext)))
4646
$(Q)rm -Rf doc/version.texi
47-
$(Q)rm -rf rt/libuv
47+
$(Q)rm -rf libuv
4848

4949
define CLEAN_STAGE_N
5050

@@ -87,4 +87,4 @@ endif
8787
endef
8888

8989
$(foreach target, $(CFG_TARGET_TRIPLES), \
90-
$(eval $(call DEF_CLEAN_LLVM_TARGET,$(target))))
90+
$(eval $(call DEF_CLEAN_LLVM_TARGET,$(target))))

‎trunk/mk/dist.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ PKG_3RDPARTY := rt/valgrind.h rt/memcheck.h \
2020
rt/bigint/bigint_ext.cpp rt/bigint/low_primes.h
2121

2222
PKG_UV := \
23-
$(wildcard $(S)src/rt/libuv/*) \
24-
$(wildcard $(S)src/rt/libuv/include/*) \
25-
$(wildcard $(S)src/rt/libuv/include/*/*) \
26-
$(wildcard $(S)src/rt/libuv/src/*) \
27-
$(wildcard $(S)src/rt/libuv/src/*/*) \
28-
$(wildcard $(S)src/rt/libuv/src/*/*/*)
23+
$(wildcard $(S)src/libuv/*) \
24+
$(wildcard $(S)src/libuv/include/*) \
25+
$(wildcard $(S)src/libuv/include/*/*) \
26+
$(wildcard $(S)src/libuv/src/*) \
27+
$(wildcard $(S)src/libuv/src/*/*) \
28+
$(wildcard $(S)src/libuv/src/*/*/*)
2929

3030
PKG_PP_EXAMPLES = $(wildcard $(S)src/test/pretty/*.pp)
3131

‎trunk/mk/libuv/ia32/mac/Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -329,23 +329,23 @@ $(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
329329

330330
ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
331331
$(findstring $(join ^,$(prefix)),\
332-
$(join ^,src/rt/libuv/run-benchmarks.target.mk)))),)
333-
include src/rt/libuv/run-benchmarks.target.mk
332+
$(join ^,src/libuv/run-benchmarks.target.mk)))),)
333+
include src/libuv/run-benchmarks.target.mk
334334
endif
335335
ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
336336
$(findstring $(join ^,$(prefix)),\
337-
$(join ^,src/rt/libuv/run-tests.target.mk)))),)
338-
include src/rt/libuv/run-tests.target.mk
337+
$(join ^,src/libuv/run-tests.target.mk)))),)
338+
include src/libuv/run-tests.target.mk
339339
endif
340340
ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
341341
$(findstring $(join ^,$(prefix)),\
342-
$(join ^,src/rt/libuv/uv.target.mk)))),)
343-
include src/rt/libuv/uv.target.mk
342+
$(join ^,src/libuv/uv.target.mk)))),)
343+
include src/libuv/uv.target.mk
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/ia32/mac" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/rt/libuv/uv.gyp
348-
#Makefile: $(srcdir)/src/rt/libuv/uv.gyp
347+
cmd_regen_makefile = ./src/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/libuv/uv.gyp
348+
Makefile: $(srcdir)/src/libuv/uv.gyp
349349
# $(call do_cmd,regen_makefile)
350350

351351
# "all" is a concatenation of the "all" targets from all the included

0 commit comments

Comments
 (0)