Skip to content

Commit 6661bc0

Browse files
committed
---
yaml --- r: 71771 b: refs/heads/dist-snap c: 99b156e h: refs/heads/master i: 71769: b8f4a90 71767: 39fb5e2 v: v3
1 parent 81512c9 commit 6661bc0

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
10-
refs/heads/dist-snap: b5d82242124a153801f571bcfcb786a8872aa46e
10+
refs/heads/dist-snap: 99b156e78a592e8195ae7918a1ad958abef96050
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/mk/platform.mk

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,31 @@ CFG_RUN_arm-linux-androideabi=
239239
CFG_RUN_TARG_arm-linux-androideabi=
240240
RUSTC_FLAGS_arm-linux-androideabi :=--android-cross-path=$(CFG_ANDROID_CROSS_PATH)
241241

242+
# mips-unknown-linux-gnu configuration
243+
CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
244+
CXX_mips-unknown-linux-gnu=mips-linux-gnu-g++
245+
CPP_mips-unknown-linux-gnu=mips-linux-gnu-gcc -E
246+
AR_mips-unknown-linux-gnu=mips-linux-gnu-ar
247+
CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
248+
CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
249+
CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
250+
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32
251+
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti
252+
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
253+
CFG_GCCISH_DEF_FLAG_mips-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
254+
CFG_GCCISH_PRE_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-whole-archive
255+
CFG_GCCISH_POST_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-no-whole-archive -Wl,-znoexecstack
256+
CFG_DEF_SUFFIX_mips-unknown-linux-gnu := .linux.def
257+
CFG_INSTALL_NAME_mips-unknown-linux-gnu =
258+
CFG_LIBUV_LINK_FLAGS_mips-unknown-linux-gnu =
259+
CFG_EXE_SUFFIX_mips-unknown-linux-gnu :=
260+
CFG_WINDOWSY_mips-unknown-linux-gnu :=
261+
CFG_UNIXY_mips-unknown-linux-gnu := 1
262+
CFG_PATH_MUNGE_mips-unknown-linux-gnu := true
263+
CFG_LDPATH_mips-unknown-linux-gnu :=
264+
CFG_RUN_mips-unknown-linux-gnu=
265+
CFG_RUN_TARG_mips-unknown-linux-gnu=
266+
242267
# i686-pc-mingw32 configuration
243268
CC_i686-pc-mingw32=$(CC)
244269
CXX_i686-pc-mingw32=$(CXX)

branches/dist-snap/mk/rt.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
LIBUV_FLAGS_i386 = -m32 -fPIC
2828
LIBUV_FLAGS_x86_64 = -m64 -fPIC
2929
LIBUV_FLAGS_arm = -fPIC -DANDROID -std=gnu99
30+
LIBUV_FLAGS_mips = -fPIC -mips32r2 -msoft-float -mabi=32
3031

3132
# when we're doing a snapshot build, we intentionally degrade as many
3233
# features in libuv and the runtime as possible, to ease portability.
@@ -180,6 +181,10 @@ else
180181
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
181182
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
182183
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
184+
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
185+
CC="$$(CC_$(1))" \
186+
CXX="$$(CXX_$(1))" \
187+
AR="$$(AR_$(1))" \
183188
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
184189
V=$$(VERBOSE)
185190
endif

0 commit comments

Comments
 (0)