Skip to content

Commit d57d25a

Browse files
huonwhuonw
committed
---
yaml --- r: 96249 b: refs/heads/dist-snap c: b052f28 h: refs/heads/master i: 96247: b62ac28 v: v3
1 parent 2787517 commit d57d25a

File tree

21 files changed

+538
-633
lines changed

21 files changed

+538
-633
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 738eb9b930825ad6b4974dd8b645ec753231161c
9+
refs/heads/dist-snap: b052f28fd69ac641a71987cb1ca6f9e7d9840585
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/mk/platform.mk

Lines changed: 21 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,12 @@ CFG_LDPATH_arm-linux-androideabi :=
300300
CFG_RUN_arm-linux-androideabi=
301301
CFG_RUN_TARG_arm-linux-androideabi=
302302
RUSTC_FLAGS_arm-linux-androideabi :=--android-cross-path=$(CFG_ANDROID_CROSS_PATH)
303-
RUSTC_CROSS_FLAGS_arm-linux-androideabi :=--android-cross-path=$(CFG_ANDROID_CROSS_PATH)
304303

305304
# arm-unknown-linux-gnueabihf configuration
306-
CROSS_PREFIX_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-
307-
CC_arm-unknown-linux-gnueabihf=gcc
308-
CXX_arm-unknown-linux-gnueabihf=g++
309-
CPP_arm-unknown-linux-gnueabihf=gcc -E
310-
AR_arm-unknown-linux-gnueabihf=ar
305+
CC_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-gcc
306+
CXX_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-g++
307+
CPP_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-gcc -E
308+
AR_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-ar
311309
CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
312310
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
313311
CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
@@ -326,17 +324,15 @@ CFG_WINDOWSY_arm-unknown-linux-gnueabihf :=
326324
CFG_UNIXY_arm-unknown-linux-gnueabihf := 1
327325
CFG_PATH_MUNGE_arm-unknown-linux-gnueabihf := true
328326
CFG_LDPATH_arm-unknown-linux-gnueabihf :=
329-
CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
330-
CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
331-
RUSTC_FLAGS_arm-unknown-linux-gnueabihf :=
332-
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabihf)$(CXX_arm-unknown-linux-gnueabihf)
327+
CFG_RUN_arm-unknown-linux-gnueabihf=
328+
CFG_RUN_TARG_arm-unknown-linux-gnueabihf=
329+
RUSTC_FLAGS_arm-unknown-linux-gnueabihf := --linker=$(CC_arm-unknown-linux-gnueabihf)
333330

334331
# arm-unknown-linux-gnueabi configuration
335-
CROSS_PREFIX_arm-unknown-linux-gnueabi=arm-linux-gnueabi-
336-
CC_arm-unknown-linux-gnueabi=gcc
337-
CXX_arm-unknown-linux-gnueabi=g++
338-
CPP_arm-unknown-linux-gnueabi=gcc -E
339-
AR_arm-unknown-linux-gnueabi=ar
332+
CC_arm-unknown-linux-gnueabi=arm-linux-gnueabi-gcc
333+
CXX_arm-unknown-linux-gnueabi=arm-linux-gnueabi-g++
334+
CPP_arm-unknown-linux-gnueabi=arm-linux-gnueabi-gcc -E
335+
AR_arm-unknown-linux-gnueabi=arm-linux-gnueabi-ar
340336
CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
341337
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
342338
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
@@ -355,10 +351,9 @@ CFG_WINDOWSY_arm-unknown-linux-gnueabi :=
355351
CFG_UNIXY_arm-unknown-linux-gnueabi := 1
356352
CFG_PATH_MUNGE_arm-unknown-linux-gnueabi := true
357353
CFG_LDPATH_arm-unknown-linux-gnueabi :=
358-
CFG_RUN_arm-unknown-linux-gnueabi=$(2)
359-
CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,,$(2))
360-
RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
361-
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi := --linker=$(CROSS_PREFIX_arm-unknown-linux-gnueabi)$(CXX_arm-unknown-linux-gnueabi)
354+
CFG_RUN_arm-unknown-linux-gnueabi=
355+
CFG_RUN_TARG_arm-unknown-linux-gnueabi=
356+
RUSTC_FLAGS_arm-unknown-linux-gnueabi := --linker=$(CC_arm-unknown-linux-gnueabi)
362357

363358
# mips-unknown-linux-gnu configuration
364359
CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
@@ -404,7 +399,7 @@ CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
404399
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
405400
CFG_DEF_SUFFIX_i686-pc-mingw32 := .mingw32.def
406401
CFG_INSTALL_NAME_i686-pc-mingw32 =
407-
CFG_LIBUV_LINK_FLAGS_i686-pc-mingw32 := -lws2_32 -lpsapi -liphlpapi
402+
CFG_LIBUV_LINK_FLAGS_i686-pc-mingw32 := -lWs2_32 -lpsapi -liphlpapi
408403
CFG_LLVM_BUILD_ENV_i686-pc-mingw32 := CPATH=$(CFG_SRC_DIR)src/etc/mingw-fix-include
409404
CFG_EXE_SUFFIX_i686-pc-mingw32 := .exe
410405
CFG_WINDOWSY_i686-pc-mingw32 := 1
@@ -442,61 +437,31 @@ CFG_LDPATH_i586-mingw32msvc :=
442437
CFG_RUN_i586-mingw32msvc=
443438
CFG_RUN_TARG_i586-mingw32msvc=
444439

445-
# i686-w64-mingw32 configuration
446-
CROSS_PREFIX_i686-w64-mingw32=i686-w64-mingw32-
447-
CC_i686-w64-mingw32=gcc
448-
CXX_i686-w64-mingw32=g++
449-
CPP_i686-w64-mingw32=gcc -E
450-
AR_i686-w64-mingw32=ar
451-
CFG_LIB_NAME_i686-w64-mingw32=$(1).dll
452-
CFG_STATIC_LIB_NAME_i686-w64-mingw32=$(1).lib
453-
CFG_LIB_GLOB_i686-w64-mingw32=$(1)-*.dll
454-
CFG_LIB_DSYM_GLOB_i686-w64-mingw32=$(1)-*.dylib.dSYM
455-
CFG_GCCISH_CFLAGS_i686-w64-mingw32 := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600
456-
CFG_GCCISH_CXXFLAGS_i686-w64-mingw32 := -fno-rtti
457-
CFG_GCCISH_LINK_FLAGS_i686-w64-mingw32 := -shared -g -m32
458-
CFG_GCCISH_DEF_FLAG_i686-w64-mingw32 :=
459-
CFG_GCCISH_PRE_LIB_FLAGS_i686-w64-mingw32 :=
460-
CFG_GCCISH_POST_LIB_FLAGS_i686-w64-mingw32 :=
461-
CFG_DEF_SUFFIX_i686-w64-mingw32 := .mingw32.def
462-
CFG_INSTALL_NAME_i686-w64-mingw32 =
463-
CFG_LIBUV_LINK_FLAGS_i686-w64-mingw32 := -lws2_32 -lpsapi -liphlpapi
464-
CFG_EXE_SUFFIX_i686-w64-mingw32 := .exe
465-
CFG_WINDOWSY_i686-w64-mingw32 := 1
466-
CFG_UNIXY_i686-w64-mingw32 :=
467-
CFG_PATH_MUNGE_i686-w64-mingw32 :=
468-
CFG_LDPATH_i686-w64-mingw32 :=$(CFG_LDPATH_i686-w64-mingw32):$(PATH)
469-
CFG_RUN_i686-w64-mingw32=PATH="$(CFG_LDPATH_i686-w64-mingw32):$(1)" $(2)
470-
CFG_RUN_TARG_i686-w64-mingw32=$(call CFG_RUN_i686-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
471-
RUSTC_CROSS_FLAGS_i686-w64-mingw32 := --linker=$(CROSS_PREFIX_i686-w64-mingw32)$(CXX_i686-w64-mingw32)
472-
473440
# x86_64-w64-mingw32 configuration
474-
CROSS_PREFIX_x86_64-w64-mingw32=x86_64-w64-mingw32-
475-
CC_x86_64-w64-mingw32=gcc
476-
CXX_x86_64-w64-mingw32=g++
477-
CPP_x86_64-w64-mingw32=gcc -E
478-
AR_x86_64-w64-mingw32=ar
441+
CC_x86_64-w64-mingw32=$(CC)
442+
CXX_x86_64-w64-mingw32=$(CXX)
443+
CPP_x86_64-w64-mingw32=$(CPP)
444+
AR_x86_64-w64-mingw32=$(AR)
479445
CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll
480446
CFG_STATIC_LIB_NAME_x86_64-w64-mingw32=$(1).lib
481447
CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll
482448
CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM
483449
CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600
484450
CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti
485-
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -g -m64
451+
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -fPIC -g -m64
486452
CFG_GCCISH_DEF_FLAG_x86_64-w64-mingw32 :=
487453
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-w64-mingw32 :=
488454
CFG_GCCISH_POST_LIB_FLAGS_x86_64-w64-mingw32 :=
489455
CFG_DEF_SUFFIX_x86_64-w64-mingw32 := .mingw32.def
490456
CFG_INSTALL_NAME_x86_64-w64-mingw32 =
491-
CFG_LIBUV_LINK_FLAGS_x86_64-w64-mingw32 := -lws2_32 -lpsapi -liphlpapi
457+
CFG_LIBUV_LINK_FLAGS_x86_64-w64-mingw32 := -lWs2_32 -lpsapi -liphlpapi
492458
CFG_EXE_SUFFIX_x86_64-w64-mingw32 := .exe
493459
CFG_WINDOWSY_x86_64-w64-mingw32 := 1
494460
CFG_UNIXY_x86_64-w64-mingw32 :=
495461
CFG_PATH_MUNGE_x86_64-w64-mingw32 :=
496462
CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32):$(PATH)
497463
CFG_RUN_x86_64-w64-mingw32=PATH="$(CFG_LDPATH_x86_64-w64-mingw32):$(1)" $(2)
498464
CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
499-
RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 := --linker=$(CROSS_PREFIX_x86_64-w64-mingw32)$(CXX_x86_64-w64-mingw32)
500465

501466
# x86_64-unknown-freebsd configuration
502467
CC_x86_64-unknown-freebsd=$(CC)
@@ -534,16 +499,6 @@ ifdef CFG_CCACHE_BASEDIR
534499
endif
535500

536501
define CFG_MAKE_TOOLCHAIN
537-
# Prepend the tools with their prefix if cross compiling
538-
ifneq ($(CFG_BUILD),$(1))
539-
CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1))
540-
CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
541-
CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
542-
AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
543-
544-
RUSTC_FLAGS_$(1)=$(RUSTC_CROSS_FLAGS_$(1))
545-
endif
546-
547502
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
548503
$$(CFG_GCCISH_CFLAGS) \
549504
$$(CFG_GCCISH_CFLAGS_$(1)) \

‎branches/dist-snap/mk/rt.mk

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,23 @@
2323
# fit the experimental data (i.e., I was able to get the system
2424
# working under these assumptions).
2525

26+
# Hack for passing flags into LIBUV, see below.
27+
LIBUV_FLAGS_i386 = -m32 -fPIC -I$(S)src/etc/mingw-fix-include
28+
LIBUV_FLAGS_x86_64 = -m64 -fPIC
29+
ifeq ($(OSTYPE_$(1)), linux-androideabi)
30+
LIBUV_FLAGS_arm = -fPIC -DANDROID -std=gnu99
31+
else ifeq ($(OSTYPE_$(1)), apple-darwin)
32+
ifeq ($(HOST_$(1)), arm)
33+
IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
34+
LIBUV_FLAGS_arm := -fPIC -std=gnu99 -I$(IOS_SDK)/usr/include -I$(IOS_SDK)/usr/include/c++/4.2.1
35+
else
36+
LIBUV_FLAGS_arm := -fPIC -std=gnu99
37+
endif
38+
else
39+
LIBUV_FLAGS_arm = -fPIC -std=gnu99
40+
endif
41+
LIBUV_FLAGS_mips = -fPIC -mips32r2 -msoft-float -mabi=32
42+
2643
# when we're doing a snapshot build, we intentionally degrade as many
2744
# features in libuv and the runtime as possible, to ease portability.
2845

@@ -192,9 +209,6 @@ LIBUV_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/libuv/$$(LIBUV_NAME_$(1))
192209

193210
LIBUV_MAKEFILE_$(1) := $$(CFG_BUILD_DIR)$$(RT_OUTPUT_DIR_$(1))/libuv/Makefile
194211

195-
# libuv triggers a few warnings on some platforms
196-
LIBUV_CFLAGS_$(1) := $(subst -Werror,,$(CFG_GCCISH_CFLAGS_$(1)))
197-
198212
$$(LIBUV_MAKEFILE_$(1)): $$(LIBUV_DEPS)
199213
(cd $(S)src/libuv/ && \
200214
$$(CFG_PYTHON) ./gyp_uv.py -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) \
@@ -208,17 +222,15 @@ $$(LIBUV_MAKEFILE_$(1)): $$(LIBUV_DEPS)
208222
ifdef CFG_WINDOWSY_$(1)
209223
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
210224
$$(Q)$$(MAKE) -C $$(S)src/libuv -f Makefile.mingw \
211-
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS_$(1))" \
212-
CC="$$(CC_$(1)) $$(LIBUV_CFLAGS_$(1)) $$(SNAP_DEFINES)" \
213-
CXX="$$(CXX_$(1))" \
225+
CC="$$(CC) $$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
214226
AR="$$(AR_$(1))" \
215227
V=$$(VERBOSE)
216228
$$(Q)cp $$(S)src/libuv/libuv.a $$@
217229
else
218230
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1))
219231
$$(Q)$$(MAKE) -C $$(@D) \
220-
CFLAGS="$$(LIBUV_CFLAGS_$(1)) $$(SNAP_DEFINES)" \
221-
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS_$(1))" \
232+
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
233+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
222234
CC="$$(CC_$(1))" \
223235
CXX="$$(CXX_$(1))" \
224236
AR="$$(AR_$(1))" \

0 commit comments

Comments
 (0)