Skip to content

Commit ba2af74

Browse files
RufflewindRufflewind
committed
---
yaml --- r: 120205 b: refs/heads/dist-snap c: 77c56f7 h: refs/heads/master i: 120203: 2e069b2 v: v3
1 parent 9eaf950 commit ba2af74

File tree

948 files changed

+30729
-31928
lines changed

Some content is hidden

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

948 files changed

+30729
-31928
lines changed

‎[refs]

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

‎branches/dist-snap/.gitattributes

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

‎branches/dist-snap/.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,3 @@
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

‎branches/dist-snap/AUTHORS.txt

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

‎branches/dist-snap/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 2014, and you change a Rust file that was created in
36+
example, if it's 2013, and you change a Rust file that was created in
3737
2010, it should begin:
3838

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

4343
For more details, please refer to

‎branches/dist-snap/LICENSE-MIT

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

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

‎branches/dist-snap/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.7 or `clang++` 3.x
23+
* `g++` 4.4 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

‎branches/dist-snap/configure

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -466,26 +466,6 @@ 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-
489469
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
490470
then
491471
probe CFG_PAXCTL paxctl /sbin/paxctl
@@ -782,7 +762,6 @@ do
782762
for s in 0 1 2 3
783763
do
784764
make_dir $t/rt/stage$s
785-
make_dir $t/rt/jemalloc
786765
make_dir $t/rt/libuv
787766
make_dir $t/rt/libuv/src/ares
788767
make_dir $t/rt/libuv/src/eio
@@ -824,12 +803,10 @@ do
824803
make_dir $h/test/run-pass-fulldeps
825804
make_dir $h/test/run-fail
826805
make_dir $h/test/compile-fail
827-
make_dir $h/test/compile-fail-fulldeps
828806
make_dir $h/test/bench
829807
make_dir $h/test/perf
830808
make_dir $h/test/pretty
831-
make_dir $h/test/debuginfo-gdb
832-
make_dir $h/test/debuginfo-lldb
809+
make_dir $h/test/debug-info
833810
make_dir $h/test/codegen
834811
make_dir $h/test/doc-tutorial
835812
make_dir $h/test/doc-guide-ffi

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

Lines changed: 6 additions & 11 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:hoedown). All deps
41+
# dependencies have a "native:" prefix (i.e. native:sundown). All deps
4242
# will be built before the crate itself is built.
4343
#
4444
# TOOL_DEPS_<tool>/TOOL_SOURCE_<tool>
@@ -51,24 +51,22 @@
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 graphviz core
55-
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros
54+
workcache url log regex
55+
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

59-
DEPS_core :=
60-
DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace native:jemalloc
59+
DEPS_std := libc native:rustrt native:compiler-rt native:backtrace
6160
DEPS_green := std rand native:context_switch
6261
DEPS_rustuv := std native:uv native:uv_support
6362
DEPS_native := std
64-
DEPS_syntax := std term serialize collections log fmt_macros
63+
DEPS_syntax := std term serialize collections log
6564
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
6665
collections time log
67-
DEPS_rustdoc := rustc native:hoedown serialize sync getopts collections \
66+
DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
6867
test time
6968
DEPS_flate := std native:miniz
7069
DEPS_arena := std collections
71-
DEPS_graphviz := std
7270
DEPS_glob := std
7371
DEPS_serialize := std collections log
7472
DEPS_term := std collections
@@ -88,7 +86,6 @@ DEPS_workcache := std serialize collections log
8886
DEPS_log := std sync
8987
DEPS_regex := std collections
9088
DEPS_regex_macros = syntax std regex
91-
DEPS_fmt_macros = std
9289

9390
TOOL_DEPS_compiletest := test green rustuv getopts
9491
TOOL_DEPS_rustdoc := rustdoc native
@@ -97,8 +94,6 @@ TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
9794
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
9895
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
9996

100-
ONLY_RLIB_core := 1
101-
10297
################################################################################
10398
# You should not need to edit below this line
10499
################################################################################

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ 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 \
39-
$(S)src/rt/hoedown $(S)src/jemalloc
38+
PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt
4039
PKG_FILES := \
4140
$(S)COPYRIGHT \
4241
$(S)LICENSE-APACHE \

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,26 @@ 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+
144164
# The (english) documentation for each doc item.
145165

146166
define DEF_SHOULD_BUILD_PDF_DOC

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

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

21-
ifeq ($$(ONLY_RLIB_$(5)),)
2221
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
2322
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
2423
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
@@ -31,10 +30,6 @@ $$(HLIB$(2)_H_$(4))/stamp.$(5): \
3130
$$(HLIB$(2)_H_$(4))
3231
$$(call LIST_ALL_OLD_GLOB_MATCHES,\
3332
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
34-
else
35-
$$(HLIB$(2)_H_$(4))/stamp.$(5):
36-
$$(Q)touch $$@
37-
endif
3833

3934
endef
4035

@@ -59,6 +54,9 @@ endef
5954
# $(4) - the host triple (same as $(3))
6055
define CP_HOST_STAGE_N
6156

57+
$$(HBIN$(2)_H_$(4))/:
58+
@mkdir -p $$@
59+
6260
ifneq ($(CFG_LIBDIR_RELATIVE),bin)
6361
$$(HLIB$(2)_H_$(4))/:
6462
@mkdir -p $$@

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ 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
149148
CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
150149
CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
151150
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m64
@@ -173,7 +172,6 @@ CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
173172
CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
174173
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
175174
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
176-
CFG_CFLAGS_i686-unknown-linux-gnu := -m32
177175
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32
178176
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
179177
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
@@ -203,7 +201,6 @@ AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
203201
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
204202
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
205203
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
206-
CFG_CFLAGS_arm-apple-darwin := $(CFG_IOS_FLAGS)
207204
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS)
208205
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS)
209206
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
@@ -232,7 +229,6 @@ CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
232229
CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a
233230
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
234231
CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
235-
CFG_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64
236232
CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64
237233
CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti
238234
CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread -framework CoreServices -m64
@@ -260,7 +256,6 @@ CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
260256
CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a
261257
CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
262258
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
263-
CFG_CFLAGS_i686-apple-darwin := -m32 -arch i386
264259
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
265260
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
266261
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread -framework CoreServices -m32
@@ -288,7 +283,6 @@ CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
288283
CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
289284
CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
290285
CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
291-
CFG_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__
292286
CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__
293287
CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti
294288
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
@@ -319,7 +313,6 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
319313
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
320314
CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
321315
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
322-
CFG_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__
323316
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__
324317
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti
325318
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
@@ -337,7 +330,7 @@ CFG_PATH_MUNGE_arm-unknown-linux-gnueabihf := true
337330
CFG_LDPATH_arm-unknown-linux-gnueabihf :=
338331
CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
339332
CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
340-
RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v6,+vfp2
333+
RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp3
341334
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf :=
342335

343336
# arm-unknown-linux-gnueabi configuration
@@ -350,7 +343,6 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
350343
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
351344
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
352345
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
353-
CFG_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp
354346
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp
355347
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti
356348
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
@@ -380,7 +372,6 @@ CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
380372
CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a
381373
CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
382374
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
384375
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
385376
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti
386377
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
@@ -409,7 +400,6 @@ CFG_LIB_NAME_i686-pc-mingw32=$(1).dll
409400
CFG_STATIC_LIB_NAME_i686-pc-mingw32=$(1).lib
410401
CFG_LIB_GLOB_i686-pc-mingw32=$(1)-*.dll
411402
CFG_LIB_DSYM_GLOB_i686-pc-mingw32=$(1)-*.dylib.dSYM
412-
CFG_CFLAGS_mips-i686-pc-mingw32 := -m32 -march=i686 -D_WIN32_WINNT=0x0600
413403
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
414404
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
415405
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g -m32
@@ -438,7 +428,6 @@ CFG_LIB_NAME_i586-mingw32msvc=$(1).dll
438428
CFG_STATIC_LIB_NAME_i586-mingw32msvc=$(1).lib
439429
CFG_LIB_GLOB_i586-mingw32msvc=$(1)-*.dll
440430
CFG_LIB_DSYM_GLOB_i586-mingw32msvc=$(1)-*.dylib.dSYM
441-
CFG_CFLAGS_i586-mingw32msvc := -march=i586 -m32
442431
CFG_GCCISH_CFLAGS_i586-mingw32msvc := -Wall -Werror -g -march=i586 -m32
443432
CFG_GCCISH_CXXFLAGS_i586-mingw32msvc := -fno-rtti
444433
CFG_GCCISH_LINK_FLAGS_i586-mingw32msvc := -shared -g -m32
@@ -469,7 +458,6 @@ CFG_LIB_NAME_i686-w64-mingw32=$(1).dll
469458
CFG_STATIC_LIB_NAME_i686-w64-mingw32=$(1).lib
470459
CFG_LIB_GLOB_i686-w64-mingw32=$(1)-*.dll
471460
CFG_LIB_DSYM_GLOB_i686-w64-mingw32=$(1)-*.dylib.dSYM
472-
CFG_CFLAGS_i586-w64-mingw32 := -march=i586 -m32 -D_WIN32_WINNT=0x0600
473461
CFG_GCCISH_CFLAGS_i686-w64-mingw32 := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600
474462
CFG_GCCISH_CXXFLAGS_i686-w64-mingw32 := -fno-rtti
475463
CFG_GCCISH_LINK_FLAGS_i686-w64-mingw32 := -shared -g -m32
@@ -499,7 +487,6 @@ CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll
499487
CFG_STATIC_LIB_NAME_x86_64-w64-mingw32=$(1).lib
500488
CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll
501489
CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM
502-
CFG_CFLAGS_x86_64-w64-mingw32 := -m64 -D_WIN32_WINNT=0x0600
503490
CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600
504491
CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti
505492
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -g -m64
@@ -528,7 +515,6 @@ CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
528515
CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a
529516
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
530517
CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
531-
CFG_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include
532518
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include
533519
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt
534520
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ 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-
$$(if $$(findstring 1,$$(ONLY_RLIB_$(1))),,\
110-
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1)))),),)
109+
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1))),),)
111110
endef
112111

113112

@@ -134,8 +133,7 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
134133
$$(if $$(findstring $(3), $$(PREPARE_HOST)),\
135134
$$(call PREPARE_DIR,$$(PREPARE_WORKING_DEST_LIB_DIR))\
136135
$$(foreach crate,$$(TARGET_CRATES),\
137-
$$(if $$(findstring 1, $$(ONLY_RLIB_$$(crate))),,\
138-
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate))))\
136+
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))\
139137
$$(call PREPARE_LIB,$$(call CFG_RLIB_GLOB,$$(crate))))\
140138
$$(if $$(findstring $(2),$$(CFG_HOST)),\
141139
$$(foreach crate,$$(HOST_CRATES),\

0 commit comments

Comments
 (0)