Skip to content

Commit 621d748

Browse files
borsbors
committed
---
yaml --- r: 114024 b: refs/heads/master c: edae0bd h: refs/heads/master v: v3
1 parent 90d7ec3 commit 621d748

File tree

947 files changed

+31921
-30722
lines changed

Some content is hidden

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

947 files changed

+31921
-30722
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 77c56f7cebaedb8e98e8002351f21137b4c61636
2+
refs/heads/master: edae0bdabf75b6acf4f0f0eb5bc2bd3b29d58b81
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
55
refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

‎trunk/.gitattributes

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
src/etc/pkg/rust-logo.ico binary
88
src/etc/pkg/rust-logo.png binary
99
src/rt/msvc/* -whitespace
10-
src/rt/vg/* -whitespace
11-
src/rt/jemalloc/**/* -whitespace
10+
src/rt/valgrind/* -whitespace

‎trunk/.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@
1212
[submodule "src/compiler-rt"]
1313
path = src/compiler-rt
1414
url = https://github.com/rust-lang/compiler-rt.git
15+
[submodule "src/rt/hoedown"]
16+
path = src/rt/hoedown
17+
url = https://github.com/rust-lang/hoedown.git
18+
[submodule "src/jemalloc"]
19+
path = src/jemalloc
20+
url = https://github.com/rust-lang/jemalloc.git

‎trunk/AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ Raphael Speyer <[email protected]>
362362
reedlepee <[email protected]>
363363
Reuben Morais <[email protected]>
364364
Richard Diamond <[email protected]>
365+
Richo Healey <[email protected]>
365366
Rick Waldron <[email protected]>
366367
Rob Arnold <[email protected]>
367368
Rob Hoelz <[email protected]>

‎trunk/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ message explaining why.
3333

3434
In the licensing header at the beginning of any files you change,
3535
please make sure the listed date range includes the current year. For
36-
example, if it's 2013, and you change a Rust file that was created in
36+
example, if it's 2014, and you change a Rust file that was created in
3737
2010, it should begin:
3838

3939
```
40-
// Copyright 2010-2013 The Rust Project Developers.
40+
// Copyright 2010-2014 The Rust Project Developers.
4141
```
4242

4343
For more details, please refer to

‎trunk/LICENSE-MIT

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Copyright (c) 2006-2009 Graydon Hoare
2-
Copyright (c) 2009-2014 Mozilla Foundation
1+
Copyright (c) 2014 The Rust Project Developers
32

43
Permission is hereby granted, free of charge, to any
54
person obtaining a copy of this software and associated

‎trunk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ documentation.
2020
## Building from Source
2121

2222
1. Make sure you have installed the dependencies:
23-
* `g++` 4.4 or `clang++` 3.x
23+
* `g++` 4.7 or `clang++` 3.x
2424
* `python` 2.6 or later (but not 3.x)
2525
* `perl` 5.0 or later
2626
* GNU `make` 3.81 or later

‎trunk/configure

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,26 @@ probe CFG_PDFLATEX pdflatex
466466
probe CFG_XELATEX xelatex
467467
probe CFG_LUALATEX lualatex
468468
probe CFG_GDB gdb
469+
probe CFG_LLDB lldb
470+
471+
if [ ! -z "$CFG_LLDB" ]
472+
then
473+
# If CFG_LLDB_PYTHON_DIR is not already set from the outside and valid, try to read it from
474+
# LLDB via the -P commandline options.
475+
if [ -z "$CFG_LLDB_PYTHON_DIR" ] || [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
476+
then
477+
CFG_LLDB_PYTHON_DIR=$($CFG_LLDB -P)
478+
479+
# If CFG_LLDB_PYTHON_DIR is not a valid directory, set it to something more readable
480+
if [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
481+
then
482+
CFG_LLDB_PYTHON_DIR="LLDB_PYTHON_DIRECTORY_NOT_FOUND"
483+
fi
484+
485+
putvar CFG_LLDB_PYTHON_DIR
486+
fi
487+
fi
488+
469489
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
470490
then
471491
probe CFG_PAXCTL paxctl /sbin/paxctl
@@ -762,6 +782,7 @@ do
762782
for s in 0 1 2 3
763783
do
764784
make_dir $t/rt/stage$s
785+
make_dir $t/rt/jemalloc
765786
make_dir $t/rt/libuv
766787
make_dir $t/rt/libuv/src/ares
767788
make_dir $t/rt/libuv/src/eio
@@ -803,10 +824,12 @@ do
803824
make_dir $h/test/run-pass-fulldeps
804825
make_dir $h/test/run-fail
805826
make_dir $h/test/compile-fail
827+
make_dir $h/test/compile-fail-fulldeps
806828
make_dir $h/test/bench
807829
make_dir $h/test/perf
808830
make_dir $h/test/pretty
809-
make_dir $h/test/debug-info
831+
make_dir $h/test/debuginfo-gdb
832+
make_dir $h/test/debuginfo-lldb
810833
make_dir $h/test/codegen
811834
make_dir $h/test/doc-tutorial
812835
make_dir $h/test/doc-guide-ffi

‎trunk/mk/crates.mk

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# DEPS_<crate>
3939
# These lists are the dependencies of the <crate> that is to be built.
4040
# Rust dependencies are listed bare (i.e. std, green) and native
41-
# dependencies have a "native:" prefix (i.e. native:sundown). All deps
41+
# dependencies have a "native:" prefix (i.e. native:hoedown). All deps
4242
# will be built before the crate itself is built.
4343
#
4444
# TOOL_DEPS_<tool>/TOOL_SOURCE_<tool>
@@ -51,22 +51,24 @@
5151

5252
TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time rand \
54-
workcache url log regex
55-
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros
54+
workcache url log regex graphviz core
55+
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

59-
DEPS_std := libc native:rustrt native:compiler-rt native:backtrace
59+
DEPS_core :=
60+
DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace native:jemalloc
6061
DEPS_green := std rand native:context_switch
6162
DEPS_rustuv := std native:uv native:uv_support
6263
DEPS_native := std
63-
DEPS_syntax := std term serialize collections log
64+
DEPS_syntax := std term serialize collections log fmt_macros
6465
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
6566
collections time log
66-
DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
67+
DEPS_rustdoc := rustc native:hoedown serialize sync getopts collections \
6768
test time
6869
DEPS_flate := std native:miniz
6970
DEPS_arena := std collections
71+
DEPS_graphviz := std
7072
DEPS_glob := std
7173
DEPS_serialize := std collections log
7274
DEPS_term := std collections
@@ -86,6 +88,7 @@ DEPS_workcache := std serialize collections log
8688
DEPS_log := std sync
8789
DEPS_regex := std collections
8890
DEPS_regex_macros = syntax std regex
91+
DEPS_fmt_macros = std
8992

9093
TOOL_DEPS_compiletest := test green rustuv getopts
9194
TOOL_DEPS_rustdoc := rustdoc native
@@ -94,6 +97,8 @@ TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
9497
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
9598
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
9699

100+
ONLY_RLIB_core := 1
101+
97102
################################################################################
98103
# You should not need to edit below this line
99104
################################################################################

‎trunk/mk/dist.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
3535

3636
PKG_TAR = dist/$(PKG_NAME).tar.gz
3737

38-
PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt
38+
PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt \
39+
$(S)src/rt/hoedown $(S)src/jemalloc
3940
PKG_FILES := \
4041
$(S)COPYRIGHT \
4142
$(S)LICENSE-APACHE \

‎trunk/mk/docs.mk

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -141,26 +141,6 @@ doc/footer.inc: $(D)/footer.inc | doc/
141141
@$(call E, cp: $@)
142142
$(Q)cp -a $< $@ 2> /dev/null
143143

144-
doc/FiraSans-Regular.woff: $(D)/FiraSans-Regular.woff | doc/
145-
@$(call E, cp: $@)
146-
$(Q)cp -a $< $@ 2> /dev/null
147-
148-
doc/FiraSans-Medium.woff: $(D)/FiraSans-Medium.woff | doc/
149-
@$(call E, cp: $@)
150-
$(Q)cp -a $< $@ 2> /dev/null
151-
152-
doc/Heuristica-Regular.woff: $(D)/Heuristica-Regular.woff | doc/
153-
@$(call E, cp: $@)
154-
$(Q)cp -a $< $@ 2> /dev/null
155-
156-
doc/Heuristica-Italic.woff: $(D)/Heuristica-Italic.woff | doc/
157-
@$(call E, cp: $@)
158-
$(Q)cp -a $< $@ 2> /dev/null
159-
160-
doc/Heuristica-Bold.woff: $(D)/Heuristica-Bold.woff | doc/
161-
@$(call E, cp: $@)
162-
$(Q)cp -a $< $@ 2> /dev/null
163-
164144
# The (english) documentation for each doc item.
165145

166146
define DEF_SHOULD_BUILD_PDF_DOC

‎trunk/mk/host.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# $(5) - the name of the crate being processed
1919
define CP_HOST_STAGE_N_CRATE
2020

21+
ifeq ($$(ONLY_RLIB_$(5)),)
2122
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
2223
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
2324
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
@@ -30,6 +31,10 @@ $$(HLIB$(2)_H_$(4))/stamp.$(5): \
3031
$$(HLIB$(2)_H_$(4))
3132
$$(call LIST_ALL_OLD_GLOB_MATCHES,\
3233
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
34+
else
35+
$$(HLIB$(2)_H_$(4))/stamp.$(5):
36+
$$(Q)touch $$@
37+
endif
3338

3439
endef
3540

@@ -54,9 +59,6 @@ endef
5459
# $(4) - the host triple (same as $(3))
5560
define CP_HOST_STAGE_N
5661

57-
$$(HBIN$(2)_H_$(4))/:
58-
@mkdir -p $$@
59-
6062
ifneq ($(CFG_LIBDIR_RELATIVE),bin)
6163
$$(HLIB$(2)_H_$(4))/:
6264
@mkdir -p $$@

‎trunk/mk/platform.mk

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ CFG_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).so
145145
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).a
146146
CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so
147147
CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
148+
CFG_CFLAGS_x86_64-unknown-linux-gnu := -m64
148149
CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
149150
CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
150151
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m64
@@ -172,6 +173,7 @@ CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
172173
CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
173174
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
174175
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
176+
CFG_CFLAGS_i686-unknown-linux-gnu := -m32
175177
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32
176178
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
177179
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
@@ -201,6 +203,7 @@ AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
201203
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
202204
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
203205
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
206+
CFG_CFLAGS_arm-apple-darwin := $(CFG_IOS_FLAGS)
204207
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS)
205208
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS)
206209
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
@@ -229,6 +232,7 @@ CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
229232
CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a
230233
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
231234
CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
235+
CFG_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64
232236
CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64
233237
CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti
234238
CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread -framework CoreServices -m64
@@ -256,6 +260,7 @@ CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
256260
CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a
257261
CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
258262
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
263+
CFG_CFLAGS_i686-apple-darwin := -m32 -arch i386
259264
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
260265
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
261266
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread -framework CoreServices -m32
@@ -283,6 +288,7 @@ CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
283288
CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
284289
CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
285290
CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
291+
CFG_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__
286292
CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__
287293
CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti
288294
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
@@ -313,6 +319,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
313319
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
314320
CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
315321
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
322+
CFG_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__
316323
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__
317324
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti
318325
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
@@ -330,7 +337,7 @@ CFG_PATH_MUNGE_arm-unknown-linux-gnueabihf := true
330337
CFG_LDPATH_arm-unknown-linux-gnueabihf :=
331338
CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
332339
CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
333-
RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp3
340+
RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v6,+vfp2
334341
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf :=
335342

336343
# arm-unknown-linux-gnueabi configuration
@@ -343,6 +350,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
343350
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
344351
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
345352
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
353+
CFG_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp
346354
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp
347355
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti
348356
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
@@ -372,6 +380,7 @@ CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
372380
CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a
373381
CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
374382
CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
383+
CFG_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
375384
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
376385
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti
377386
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
@@ -400,6 +409,7 @@ CFG_LIB_NAME_i686-pc-mingw32=$(1).dll
400409
CFG_STATIC_LIB_NAME_i686-pc-mingw32=$(1).lib
401410
CFG_LIB_GLOB_i686-pc-mingw32=$(1)-*.dll
402411
CFG_LIB_DSYM_GLOB_i686-pc-mingw32=$(1)-*.dylib.dSYM
412+
CFG_CFLAGS_mips-i686-pc-mingw32 := -m32 -march=i686 -D_WIN32_WINNT=0x0600
403413
CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -m32 -march=i686 -D_WIN32_WINNT=0x0600 -I$(CFG_SRC_DIR)src/etc/mingw-fix-include
404414
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
405415
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g -m32
@@ -428,6 +438,7 @@ CFG_LIB_NAME_i586-mingw32msvc=$(1).dll
428438
CFG_STATIC_LIB_NAME_i586-mingw32msvc=$(1).lib
429439
CFG_LIB_GLOB_i586-mingw32msvc=$(1)-*.dll
430440
CFG_LIB_DSYM_GLOB_i586-mingw32msvc=$(1)-*.dylib.dSYM
441+
CFG_CFLAGS_i586-mingw32msvc := -march=i586 -m32
431442
CFG_GCCISH_CFLAGS_i586-mingw32msvc := -Wall -Werror -g -march=i586 -m32
432443
CFG_GCCISH_CXXFLAGS_i586-mingw32msvc := -fno-rtti
433444
CFG_GCCISH_LINK_FLAGS_i586-mingw32msvc := -shared -g -m32
@@ -458,6 +469,7 @@ CFG_LIB_NAME_i686-w64-mingw32=$(1).dll
458469
CFG_STATIC_LIB_NAME_i686-w64-mingw32=$(1).lib
459470
CFG_LIB_GLOB_i686-w64-mingw32=$(1)-*.dll
460471
CFG_LIB_DSYM_GLOB_i686-w64-mingw32=$(1)-*.dylib.dSYM
472+
CFG_CFLAGS_i586-w64-mingw32 := -march=i586 -m32 -D_WIN32_WINNT=0x0600
461473
CFG_GCCISH_CFLAGS_i686-w64-mingw32 := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600
462474
CFG_GCCISH_CXXFLAGS_i686-w64-mingw32 := -fno-rtti
463475
CFG_GCCISH_LINK_FLAGS_i686-w64-mingw32 := -shared -g -m32
@@ -487,6 +499,7 @@ CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll
487499
CFG_STATIC_LIB_NAME_x86_64-w64-mingw32=$(1).lib
488500
CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll
489501
CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM
502+
CFG_CFLAGS_x86_64-w64-mingw32 := -m64 -D_WIN32_WINNT=0x0600
490503
CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600
491504
CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti
492505
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -g -m64
@@ -515,6 +528,7 @@ CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
515528
CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a
516529
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
517530
CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
531+
CFG_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include
518532
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include
519533
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt
520534
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=

‎trunk/mk/prepare.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ prepare-host-lib-$(1)-$(2)-$(3)-$(4): prepare-maybe-clean-$(4) \
106106
prepare-host-dirs-$(4)
107107
$$(if $$(findstring $(2), $$(PREPARE_STAGE)),\
108108
$$(if $$(findstring $(3), $$(PREPARE_HOST)),\
109-
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1))),),)
109+
$$(if $$(findstring 1,$$(ONLY_RLIB_$(1))),,\
110+
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1)))),),)
110111
endef
111112

112113

@@ -133,7 +134,8 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
133134
$$(if $$(findstring $(3), $$(PREPARE_HOST)),\
134135
$$(call PREPARE_DIR,$$(PREPARE_WORKING_DEST_LIB_DIR))\
135136
$$(foreach crate,$$(TARGET_CRATES),\
136-
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))\
137+
$$(if $$(findstring 1, $$(ONLY_RLIB_$$(crate))),,\
138+
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate))))\
137139
$$(call PREPARE_LIB,$$(call CFG_RLIB_GLOB,$$(crate))))\
138140
$$(if $$(findstring $(2),$$(CFG_HOST)),\
139141
$$(foreach crate,$$(HOST_CRATES),\

0 commit comments

Comments
 (0)