Skip to content

Commit 70957e2

Browse files
committed
---
yaml --- r: 10475 b: refs/heads/snap-stage3 c: f8afe10 h: refs/heads/master i: 10473: 4cc4f35 10471: f915a47 v: v3
1 parent e3dbafc commit 70957e2

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: e5a5fc20290e70752af73860b1a192b33588624f
4+
refs/heads/snap-stage3: f8afe107fa7a677dc611dd39532570ddaab3bfab
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/mk/rt.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,10 @@ rt/$(1)/$(CFG_RUNTIME): $$(RUNTIME_OBJS_$(1)) $$(MKFILE_DEPS) \
142142
$$(CFG_GCCISH_POST_LIB_FLAGS) $$(RUNTIME_LIBS_$(1)) \
143143
$$(CFG_LIBUV_LINK_FLAGS),$$(RUNTIME_DEF_$(1)),$$(CFG_RUNTIME))
144144

145-
# FIXME: For some reason libuv's makefiles can't figure out the correct definition
146-
# of CC on the mingw I'm using, so we are explicitly using gcc. Also, we
147-
# have to list environment variables first on windows... mysterious
145+
# FIXME: For some reason libuv's makefiles can't figure out the
146+
# correct definition of CC on the mingw I'm using, so we are
147+
# explicitly using gcc. Also, we have to list environment variables
148+
# first on windows... mysterious
148149

149150
ifdef CFG_ENABLE_FAST_MAKE
150151
LIBUV_DEPS := $$(S)/.gitmodules

branches/snap-stage3/mk/rustllvm.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ endif
1414

1515
RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, RustWrapper.cpp)
1616

17-
# Behind an ifdef for now since this requires a patched LLVM.
18-
ifdef CFG_STACK_GROWTH
19-
RUSTLLVM_OBJS_CS_$(1) += rustllvm/RustPrologHook.cpp
20-
endif
21-
2217
RUSTLLVM_DEF_$(1) := rustllvm/rustllvm$$(CFG_DEF_SUFFIX)
2318

2419
RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \

0 commit comments

Comments
 (0)