Skip to content

Commit 66a82cb

Browse files
baroslbarosl
committed
---
yaml --- r: 174691 b: refs/heads/snap-stage3 c: 9752924 h: refs/heads/master i: 174689: f95dadc 174687: 1129e64 v: v3
1 parent d313cce commit 66a82cb

File tree

470 files changed

+9703
-5461
lines changed

Some content is hidden

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

470 files changed

+9703
-5461
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 195fd9a2b41ed9b5294f8803aeb84c1ace673e5e
4+
refs/heads/snap-stage3: 9752924dff53530050e5b236500a6551482be341
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ Robert Knight <[email protected]>
581581
Robert Millar <[email protected]>
582582
Robin Gloster <[email protected]>
583583
Robin Stocker <[email protected]>
584-
Rohit Joshi <rohit.joshi@capitalone.com>
584+
Rohit Joshi <rohit.c.joshi@gmail.com>
585585
Roland Tanglao <[email protected]>
586586
Rolf Timmermans <[email protected]>
587587
Rolf van de Krol <[email protected]>

‎branches/snap-stage3/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ please do two things:
2727

2828
Pull requests will be treated as "review requests", and we will give
2929
feedback we expect to see corrected on
30-
[style](https://github.com/rust-lang/rust/wiki/Note-style-guide) and
30+
[style](http://aturon.github.io/) and
3131
substance before pulling. Changes contributed via pull request should
3232
focus on a single issue at a time, like any other. We will not accept
3333
pull-requests that try to "sneak" unrelated changes in.

‎branches/snap-stage3/LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014 The Rust Project Developers
1+
Copyright (c) 2015 The Rust Project Developers
22

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

‎branches/snap-stage3/Makefile.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,9 @@
9797
# make check-stage1-std RUST_TEST_TASKS=1
9898
#
9999
# This is hardly all there is to know of The Rust Build System's
100-
# mysteries. The tale continues on the wiki[1][2].
100+
# mysteries. The tale continues on the wiki[1].
101101
#
102-
# [1]: https://github.com/rust-lang/rust/wiki/Note-getting-started-developing-Rust
103-
# [2]: https://github.com/rust-lang/rust/wiki/Note-testsuite
102+
# [1]: https://github.com/rust-lang/rust/wiki/Note-testsuite
104103
#
105104
# If you really feel like getting your hands dirty, then:
106105
#

‎branches/snap-stage3/README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,23 @@ documentation.
5858

5959
### Building on Windows
6060

61-
To easily build on windows we can use [MSYS2](http://sourceforge.net/projects/msys2/):
61+
To easily build on windows we can use [MSYS2](http://msys2.github.io/):
6262

6363
1. Grab the latest MSYS2 installer and go through the installer.
6464
2. Now from the MSYS2 terminal we want to install the mingw64 toolchain and the other
6565
tools we need.
6666

67-
$ pacman -S mingw-w64-i686-toolchain
68-
$ pacman -S base-devel
67+
```bash
68+
# choose one based on platform
69+
$ pacman -S mingw-w64-i686-toolchain
70+
$ pacman -S mingw-w64-x86_64-toolchain
6971

70-
3. With that now start `mingw32_shell.bat` from where you installed MSYS2 (i.e. `C:\msys`).
72+
$ pacman -S base-devel
73+
```
74+
75+
3. With that now start `mingw32_shell.bat` or `mingw64_shell.bat`
76+
from where you installed MSYS2 (i.e. `C:\msys`). Which one you
77+
choose depends on if you want 32 or 64 bit Rust.
7178
4. From there just navigate to where you have Rust's source code, configure and build it:
7279

7380
$ ./configure

‎branches/snap-stage3/configure

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,10 @@ case $CFG_CPUTYPE in
448448
CFG_CPUTYPE=aarch64
449449
;;
450450

451+
powerpc)
452+
CFG_CPUTYPE=powerpc
453+
;;
454+
451455
x86_64 | x86-64 | x64 | amd64)
452456
CFG_CPUTYPE=x86_64
453457
;;
@@ -608,7 +612,7 @@ putvar CFG_RELEASE_CHANNEL
608612
# channel.
609613
# Basing CFG_BOOTSTRAP_KEY on CFG_BOOTSTRAP_KEY lets it get picked up
610614
# during a Makefile reconfig.
611-
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%N`}"
615+
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%H:%M:%S`}"
612616
putvar CFG_BOOTSTRAP_KEY
613617

614618
step_msg "looking for build programs"
@@ -1004,7 +1008,7 @@ do
10041008
make_dir $t/rt/jemalloc
10051009
for i in \
10061010
isaac sync test \
1007-
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips
1011+
arch/i386 arch/x86_64 arch/arm arch/aarch64 arch/mips arch/powerpc
10081012
do
10091013
make_dir $t/rt/stage$s/$i
10101014
done
@@ -1169,7 +1173,7 @@ do
11691173

11701174
msg "configuring LLVM for $gnu_t"
11711175

1172-
LLVM_TARGETS="--enable-targets=x86,x86_64,arm,aarch64,mips"
1176+
LLVM_TARGETS="--enable-targets=x86,x86_64,arm,aarch64,mips,powerpc"
11731177
LLVM_BUILD="--build=$gnu_t"
11741178
LLVM_HOST="--host=$gnu_t"
11751179
LLVM_TARGET="--target=$gnu_t"

‎branches/snap-stage3/man/rustdoc.1

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,27 @@ space-separated list of plugins to run (default: '')
3535
--plugin-path <val>
3636
directory to load plugins from (default: /tmp/rustdoc_ng/plugins)
3737
.TP
38+
--target <val>
39+
target triple to document
40+
.TP
41+
--crate-name <val>
42+
specify the name of this crate
43+
.TP
3844
-L --library-path <val>
3945
directory to add to crate search path
4046
.TP
47+
--cfg <val>
48+
pass a --cfg to rustc
49+
.TP
50+
--extern <val>
51+
pass an --extern to rustc
52+
.TP
53+
--test
54+
run code examples as tests
55+
.TP
56+
--test-args <val>
57+
pass arguments to the test runner
58+
.TP
4159
--html-in-header <val>
4260
file to add to <head>
4361
.TP
@@ -47,8 +65,20 @@ file to add in <body>, before content
4765
--html-after-content <val>
4866
file to add in <body>, after content
4967
.TP
68+
--markdown-css <val>
69+
CSS files to include via <link> in a rendered Markdown file
70+
.TP
71+
--markdown-playground-url <val>
72+
URL to send code snippets to
73+
.TP
74+
--markdown-no-toc
75+
don't include table of contents
76+
.TP
5077
-h, --help
5178
Print help
79+
.TP
80+
-V, --version
81+
Print rustdoc's version
5282

5383
.SH "OUTPUT FORMATS"
5484

‎branches/snap-stage3/mk/cfg/aarch64-apple-ios.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AR_aarch64-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
1111
endif
1212
CFG_LIB_NAME_aarch64-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_aarch64-apple-ios = lib$(1)-*.a
14-
CFG_LIB_SKIP_INSTALL_aarch64-apple-ios = 1 #lib$(1)-*.a
14+
CFG_INSTALL_ONLY_RLIB_aarch64-apple-ios = 1
1515
CFG_STATIC_LIB_NAME_aarch64-apple-ios=lib$(1).a
1616
CFG_LIB_DSYM_GLOB_aarch64-apple-ios = lib$(1)-*.a.dSYM
1717
CFG_CFLAGS_aarch64-apple-ios := $(CFG_IOS_SDK_FLAGS_aarch64-apple-ios)

‎branches/snap-stage3/mk/cfg/armv7-apple-ios.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AR_armv7-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
1111
endif
1212
CFG_LIB_NAME_armv7-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_armv7-apple-ios = lib$(1)-*.a
14-
CFG_LIB_SKIP_INSTALL_armv7-apple-ios = 1 #lib$(1)-*.a
14+
CFG_INSTALL_ONLY_RLIB_armv7-apple-ios = 1
1515
CFG_STATIC_LIB_NAME_armv7-apple-ios=lib$(1).a
1616
CFG_LIB_DSYM_GLOB_armv7-apple-ios = lib$(1)-*.a.dSYM
1717
CFG_JEMALLOC_CFLAGS_armv7-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_SDK_FLAGS_armv7-apple-ios)

‎branches/snap-stage3/mk/cfg/armv7s-apple-ios.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AR_armv7s-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
1111
endif
1212
CFG_LIB_NAME_armv7s-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_armv7s-apple-ios = lib$(1)-*.a
14-
CFG_LIB_SKIP_INSTALL_armv7s-apple-ios = 1 #lib$(1)-*.a
14+
CFG_INSTALL_ONLY_RLIB_armv7s-apple-ios = 1
1515
CFG_STATIC_LIB_NAME_armv7s-apple-ios=lib$(1).a
1616
CFG_LIB_DSYM_GLOB_armv7s-apple-ios = lib$(1)-*.a.dSYM
1717
CFG_JEMALLOC_CFLAGS_armv7s-apple-ios := -arch armv7s -mfpu=vfp4 $(CFG_IOS_SDK_FLAGS_armv7s-apple-ios)

‎branches/snap-stage3/mk/cfg/i386-apple-ios.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ AR_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
1111
endif
1212
CFG_LIB_NAME_i386-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
14+
CFG_INSTALL_ONLY_RLIB_i386-apple-ios = 1
1415
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
1516
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
1617
CFG_GCCISH_CFLAGS_i386-apple-ios := -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS_i386-apple-ios)

‎branches/snap-stage3/mk/cfg/powerpc-unknown-linux-gnu.mk

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# powerpc-unknown-linux-gnu configuration
2+
CROSS_PREFIX_powerpc-unknown-linux-gnu=powerpc-linux-gnu-
3+
CC_powerpc-unknown-linux-gnu=$(CC)
4+
CXX_powerpc-unknown-linux-gnu=$(CXX)
5+
CPP_powerpc-unknown-linux-gnu=$(CPP)
6+
AR_powerpc-unknown-linux-gnu=$(AR)
7+
CFG_LIB_NAME_powerpc-unknown-linux-gnu=lib$(1).so
8+
CFG_STATIC_LIB_NAME_powerpc-unknown-linux-gnu=lib$(1).a
9+
CFG_LIB_GLOB_powerpc-unknown-linux-gnu=lib$(1)-*.so
10+
CFG_LIB_DSYM_GLOB_powerpc-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
11+
CFG_CFLAGS_powerpc-unknown-linux-gnu := -m32 $(CFLAGS)
12+
CFG_GCCISH_CFLAGS_powerpc-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
13+
CFG_GCCISH_CXXFLAGS_powerpc-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
14+
CFG_GCCISH_LINK_FLAGS_powerpc-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
15+
CFG_GCCISH_DEF_FLAG_powerpc-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
16+
CFG_GCCISH_PRE_LIB_FLAGS_powerpc-unknown-linux-gnu := -Wl,-whole-archive
17+
CFG_GCCISH_POST_LIB_FLAGS_powerpc-unknown-linux-gnu := -Wl,-no-whole-archive
18+
CFG_DEF_SUFFIX_powerpc-unknown-linux-gnu := .linux.def
19+
CFG_LLC_FLAGS_powerpc-unknown-linux-gnu :=
20+
CFG_INSTALL_NAME_powerpc-unknown-linux-gnu =
21+
CFG_EXE_SUFFIX_powerpc-unknown-linux-gnu =
22+
CFG_WINDOWSY_powerpc-unknown-linux-gnu :=
23+
CFG_UNIXY_powerpc-unknown-linux-gnu := 1
24+
CFG_PATH_MUNGE_powerpc-unknown-linux-gnu := true
25+
CFG_LDPATH_powerpc-unknown-linux-gnu :=
26+
CFG_RUN_powerpc-unknown-linux-gnu=$(2)
27+
CFG_RUN_TARG_powerpc-unknown-linux-gnu=$(call CFG_RUN_powerpc-unknown-linux-gnu,,$(2))
28+
CFG_GNU_TRIPLE_powerpc-unknown-linux-gnu := powerpc-unknown-linux-gnu

‎branches/snap-stage3/mk/cfg/x86_64-apple-ios.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AR_x86_64-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
1111
endif
1212
CFG_LIB_NAME_x86_64-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_x86_64-apple-ios = lib$(1)-*.a
14-
CFG_LIB_SKIP_INSTALL_x86_64-apple-ios = 1 #lib$(1)-*.a
14+
CFG_INSTALL_ONLY_RLIB_x86_64-apple-ios = 1
1515
CFG_STATIC_LIB_NAME_x86_64-apple-ios=lib$(1).a
1616
CFG_LIB_DSYM_GLOB_x86_64-apple-ios = lib$(1)-*.a.dSYM
1717
CFG_CFLAGS_x86_64-apple-ios := $(CFG_IOSSIM_FLAGS_x86_64-apple-ios)

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
TARGET_CRATES := libc std flate arena term \
5353
serialize getopts collections test rand \
5454
log regex graphviz core rbml alloc \
55-
unicode
55+
unicode rustc_bitflags
5656
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
57-
rustc_trans rustc_back rustc_llvm
57+
rustc_trans rustc_back rustc_llvm rustc_privacy
5858
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
5959
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
6060
TOOLS := compiletest rustdoc rustc rustbook
@@ -64,22 +64,27 @@ DEPS_libc := core
6464
DEPS_unicode := core
6565
DEPS_alloc := core libc native:jemalloc
6666
DEPS_std := core libc rand alloc collections unicode \
67-
native:rust_builtin native:backtrace native:rustrt_native
67+
native:rust_builtin native:backtrace native:rustrt_native \
68+
rustc_bitflags
6869
DEPS_graphviz := std
6970
DEPS_syntax := std term serialize log fmt_macros arena libc
7071
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
71-
rustc_typeck rustc_resolve log syntax serialize rustc_llvm rustc_trans
72+
rustc_typeck rustc_resolve log syntax serialize rustc_llvm \
73+
rustc_trans rustc_privacy
74+
7275
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
7376
log syntax serialize rustc_llvm
7477
DEPS_rustc_typeck := rustc syntax
7578
DEPS_rustc_borrowck := rustc log graphviz syntax
7679
DEPS_rustc_resolve := rustc log syntax
80+
DEPS_rustc_privacy := rustc log syntax
7781
DEPS_rustc := syntax flate arena serialize getopts rbml \
7882
log graphviz rustc_llvm rustc_back
7983
DEPS_rustc_llvm := native:rustllvm libc std
8084
DEPS_rustc_back := std syntax rustc_llvm flate log libc
8185
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
8286
test
87+
DEPS_rustc_bitflags := core
8388
DEPS_flate := std native:miniz
8489
DEPS_arena := std
8590
DEPS_graphviz := std
@@ -111,6 +116,7 @@ ONLY_RLIB_alloc := 1
111116
ONLY_RLIB_rand := 1
112117
ONLY_RLIB_collections := 1
113118
ONLY_RLIB_unicode := 1
119+
ONLY_RLIB_rustc_bitflags := 1
114120

115121
################################################################################
116122
# You should not need to edit below this line
@@ -122,12 +128,13 @@ DOC_CRATES := $(filter-out rustc, \
122128
$(filter-out rustc_borrowck, \
123129
$(filter-out rustc_resolve, \
124130
$(filter-out rustc_driver, \
131+
$(filter-out rustc_privacy, \
125132
$(filter-out log, \
126133
$(filter-out regex, \
127134
$(filter-out getopts, \
128-
$(filter-out syntax, $(CRATES)))))))))))
135+
$(filter-out syntax, $(CRATES))))))))))))
129136
COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \
130-
rustc_typeck rustc_driver syntax
137+
rustc_typeck rustc_driver syntax rustc_privacy
131138

132139
# This macro creates some simple definitions for each crate being built, just
133140
# some munging of all of the parameters above.

‎branches/snap-stage3/mk/main.mk

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.0.0
1818
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
1919
# NB Make sure it starts with a dot to conform to semver pre-release
2020
# versions (section 9)
21-
CFG_PRERELEASE_VERSION=
21+
CFG_PRERELEASE_VERSION=.1
2222

2323
CFG_FILENAME_EXTRA=4e7c5e5c
2424

@@ -30,9 +30,8 @@ CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
3030
CFG_DISABLE_UNSTABLE_FEATURES=1
3131
endif
3232
ifeq ($(CFG_RELEASE_CHANNEL),beta)
33-
# The beta channel is temporarily called 'alpha'
34-
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
35-
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-alpha$(CFG_PRERELEASE_VERSION)
33+
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
34+
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)-beta(CFG_PRERELEASE_VERSION)
3635
CFG_DISABLE_UNSTABLE_FEATURES=1
3736
endif
3837
ifeq ($(CFG_RELEASE_CHANNEL),nightly)
@@ -263,7 +262,7 @@ endif
263262
######################################################################
264263

265264
# FIXME: x86-ism
266-
LLVM_COMPONENTS=x86 arm aarch64 mips ipo bitreader bitwriter linker asmparser mcjit \
265+
LLVM_COMPONENTS=x86 arm aarch64 mips powerpc ipo bitreader bitwriter linker asmparser mcjit \
267266
interpreter instrumentation
268267

269268
# Only build these LLVM tools
@@ -331,10 +330,10 @@ ifdef CFG_DISABLE_UNSTABLE_FEATURES
331330
CFG_INFO := $(info cfg: disabling unstable features (CFG_DISABLE_UNSTABLE_FEATURES))
332331
# Turn on feature-staging
333332
export CFG_DISABLE_UNSTABLE_FEATURES
334-
endif
335333
# Subvert unstable feature lints to do the self-build
336-
export CFG_BOOTSTRAP_KEY
337334
export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
335+
endif
336+
export CFG_BOOTSTRAP_KEY
338337

339338
######################################################################
340339
# Per-stage targets and runner

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ define CFG_MAKE_TOOLCHAIN
177177
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
178178
$$(call CFG_INSTALL_NAME_$(1),$$(4))
179179

180-
ifeq ($$(findstring $(HOST_$(1)),arm aarch64 mips mipsel),)
180+
ifeq ($$(findstring $(HOST_$(1)),arm aarch64 mips mipsel powerpc),)
181181

182182
# We're using llvm-mc as our assembler because it supports
183183
# .cfi pseudo-ops on mac
@@ -189,7 +189,7 @@ define CFG_MAKE_TOOLCHAIN
189189
-o=$$(1)
190190
else
191191

192-
# For the ARM, AARCH64 and MIPS crosses, use the toolchain assembler
192+
# For the ARM, AARCH64, MIPS and POWER crosses, use the toolchain assembler
193193
# FIXME: We should be able to use the LLVM assembler
194194
CFG_ASSEMBLE_$(1)=$$(CC_$(1)) $$(CFG_GCCISH_CFLAGS_$(1)) \
195195
$$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
134134
$$(if $$(findstring $(3), $$(PREPARE_HOST)), \
135135
$$(call PREPARE_DIR,$$(PREPARE_WORKING_DEST_LIB_DIR)) \
136136
$$(foreach crate,$$(TARGET_CRATES), \
137-
$$(if $$(findstring 1, $$(ONLY_RLIB_$$(crate))),, \
137+
$$(if $$(or $$(findstring 1, $$(ONLY_RLIB_$$(crate))),$$(findstring 1,$$(CFG_INSTALL_ONLY_RLIB_$(2)))),, \
138138
$$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))) \
139139
$$(call PREPARE_LIB,$$(call CFG_RLIB_GLOB,$$(crate)))) \
140140
$$(if $$(findstring $(2),$$(CFG_HOST)), \

‎branches/snap-stage3/mk/tests.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,14 @@ ifdef CHECK_IGNORED
3838
TESTARGS += --ignored
3939
endif
4040

41-
TEST_BENCH =
4241

4342
# Arguments to the cfail/rfail/rpass/bench tests
4443
ifdef CFG_VALGRIND
4544
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
46-
TEST_BENCH =
4745
endif
4846

4947
ifdef PLEASE_BENCH
50-
TEST_BENCH = --bench
48+
TESTARGS += --bench
5149
endif
5250

5351
# Arguments to the perf tests
@@ -1011,7 +1009,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10111009
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
10121010
"$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
10131011
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1014-
$(1)
1012+
$(1) \
1013+
$$(S)
10151014
@touch $$@
10161015
else
10171016
# FIXME #11094 - The above rule doesn't work right for multiple targets

0 commit comments

Comments
 (0)