Skip to content

Commit d745044

Browse files
author
Jakub Wieczorek
committed
---
yaml --- r: 118726 b: refs/heads/snap-stage3 c: f6efb54 h: refs/heads/master v: v3
1 parent 81eab52 commit d745044

File tree

286 files changed

+3637
-5246
lines changed

Some content is hidden

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

286 files changed

+3637
-5246
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: b1646cbfd908dc948b251e362669af421100647a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 557b9e7f0f2010a15ab6f93f02bacf52bb1f696d
4+
refs/heads/snap-stage3: f6efb54d4446313d6dba93dd6bde33cd79354543
55
refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ please do two things:
2020

2121
Pull requests will be treated as "review requests", and we will give
2222
feedback we expect to see corrected on
23-
[style](https://github.com/rust-lang/rust/wiki/Note-style-guide) and
23+
[style](https://github.com/mozilla/rust/wiki/Note-style-guide) and
2424
substance before pulling. Changes contributed via pull request should
2525
focus on a single issue at a time, like any other. We will not accept
2626
pull-requests that try to "sneak" unrelated changes in.
2727

2828
Normally, all pull requests must include regression tests (see
29-
[Note-testsuite](https://github.com/rust-lang/rust/wiki/Note-testsuite))
29+
[Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite))
3030
that test your change. Occasionally, a change will be very difficult
3131
to test for. In those cases, please include a note in your commit
3232
message explaining why.
@@ -41,4 +41,4 @@ example, if it's 2014, and you change a Rust file that was created in
4141
```
4242

4343
For more details, please refer to
44-
[Note-development-policy](https://github.com/rust-lang/rust/wiki/Note-development-policy).
44+
[Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).

‎branches/snap-stage3/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898
# This is hardly all there is to know of The Rust Build System's
9999
# mysteries. The tale continues on the wiki[1][2].
100100
#
101-
# [1]: https://github.com/rust-lang/rust/wiki/Note-build-system
102-
# [2]: https://github.com/rust-lang/rust/wiki/Note-testsuite
101+
# [1]: https://github.com/mozilla/rust/wiki/Note-build-system
102+
# [2]: https://github.com/mozilla/rust/wiki/Note-testsuite
103103
#
104104
# If you really feel like getting your hands dirty, then:
105105
#

‎branches/snap-stage3/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ documentation.
1414
1515
[installer]: http://www.rust-lang.org/install.html
1616
[tutorial]: http://doc.rust-lang.org/tutorial.html
17-
[wiki-start]: https://github.com/rust-lang/rust/wiki/Note-getting-started-developing-Rust
18-
[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows
17+
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
18+
[win-wiki]: https://github.com/mozilla/rust/wiki/Using-Rust-on-Windows
1919

2020
## Building from Source
2121

@@ -38,7 +38,7 @@ documentation.
3838

3939
Or to build from the [repo] do:
4040

41-
$ git clone https://github.com/rust-lang/rust.git
41+
$ git clone https://github.com/mozilla/rust.git
4242
$ cd rust
4343

4444
Now that you have Rust's source code, you can configure and build it:
@@ -58,7 +58,7 @@ documentation.
5858
3. Read the [tutorial].
5959
4. Enjoy!
6060

61-
[repo]: https://github.com/rust-lang/rust
61+
[repo]: https://github.com/mozilla/rust
6262
[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
6363
[tutorial]: http://doc.rust-lang.org/tutorial.html
6464

@@ -83,7 +83,7 @@ swap, it will take a very long time to build.
8383

8484
There is a lot more documentation in the [wiki].
8585

86-
[wiki]: https://github.com/rust-lang/rust/wiki
86+
[wiki]: https://github.com/mozilla/rust/wiki
8787

8888
## License
8989

‎branches/snap-stage3/configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
421421
opt rpath 1 "build rpaths into rustc itself"
422422
opt nightly 0 "build nightly packages"
423423
opt verify-install 1 "verify installed binaries work"
424-
opt jemalloc 1 "build liballoc with jemalloc"
425424
valopt prefix "/usr/local" "set installation prefix"
426425
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
427426
valopt llvm-root "" "set LLVM root"
@@ -1168,7 +1167,6 @@ putvar CFG_MANDIR
11681167
putvar CFG_DISABLE_INJECT_STD_VERSION
11691168
putvar CFG_JEMALLOC_ROOT
11701169
putvar CFG_LIBUV_ROOT
1171-
putvar CFG_DISABLE_JEMALLOC
11721170

11731171
# Avoid spurious warnings from clang by feeding it original source on
11741172
# ccache-miss rather than preprocessed input.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ To build an executable with debug info:
184184
rustdoc
185185

186186
.SH "BUGS"
187-
See <\fBhttps://github.com/rust-lang/rust/issues\fR> for issues.
187+
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
188188

189189
.SH "AUTHOR"
190190
See \fBAUTHORS.txt\fR in the Rust source distribution.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ The generated HTML can be viewed with any standard web browser.
8787
rustc
8888

8989
.SH "BUGS"
90-
See <\fBhttps://github.com/rust-lang/rust/issues\fR> for issues.
90+
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
9191

9292
.SH "AUTHOR"
9393
See \fBAUTHORS.txt\fR in the Rust source distribution.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,10 @@ endef
360360
# contains spaces which confuse make.
361361
# * `LD_LIBRARY_PATH_ENV_HOSTDIR`: the entry to add to lookup path for the host
362362
# * `LD_LIBRARY_PATH_ENV_TARGETDIR`: the entry to add to lookup path for target
363-
#
363+
#
364364
# Below that, HOST_RPATH_VAR and TARGET_RPATH_VAR are defined in terms of the
365365
# above settings.
366-
#
366+
#
367367
define SREQ_CMDS
368368

369369
ifeq ($$(OSTYPE_$(3)),apple-darwin)
@@ -382,9 +382,9 @@ LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3) := \
382382
$$(CURDIR)/$$(TLIB1_T_$(2)_H_$(CFG_BUILD))
383383

384384
HOST_RPATH_VAR$(1)_T_$(2)_H_$(3) := \
385-
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))=$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3)):$$$$$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))
385+
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))=$$$$$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)):$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))
386386
TARGET_RPATH_VAR$(1)_T_$(2)_H_$(3) := \
387-
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))=$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3)):$$$$$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))
387+
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3))=$$$$$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)):$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))
388388

389389
RPATH_VAR$(1)_T_$(2)_H_$(3) := $$(HOST_RPATH_VAR$(1)_T_$(2)_H_$(3))
390390

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

Lines changed: 28 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -155,76 +155,36 @@ CFG_LDPATH_i686-unknown-linux-gnu :=
155155
CFG_RUN_i686-unknown-linux-gnu=$(2)
156156
CFG_RUN_TARG_i686-unknown-linux-gnu=$(call CFG_RUN_i686-unknown-linux-gnu,,$(2))
157157

158-
# arm-apple-ios configuration
159-
CFG_SDK_NAME_arm-apple-ios = iphoneos
160-
CFG_SDK_ARCHS_arm-apple-ios = armv7
161-
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
158+
# arm-apple-darwin configuration
159+
ifeq ($(CFG_OSTYPE),apple-darwin)
162160
CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
163-
CFG_IOS_FLAGS = -target armv7-apple-darwin -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
164-
CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
165-
CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
166-
CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
167-
AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
161+
CFG_IOS_FLAGS = -target arm-apple-darwin -isysroot $(CFG_IOS_SDK) -I$(CFG_IOS_SDK)/usr/include -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
162+
CC_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang)
163+
CXX_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
164+
CPP_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
165+
AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
166+
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
167+
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
168+
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
169+
CFG_CFLAGS_arm-apple-darwin := $(CFG_IOS_FLAGS) $(CFLAGS)
170+
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) $(CFLAGS)
171+
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS) $(CXXFLAGS)
172+
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
173+
CFG_GCCISH_DEF_FLAG_arm-apple-darwin := -Wl,-exported_symbols_list,
174+
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-darwin :=
175+
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-darwin :=
176+
CFG_DEF_SUFFIX_arm-apple-darwin := .darwin.def
177+
CFG_LLC_FLAGS_arm-apple-darwin :=
178+
CFG_INSTALL_NAME_arm-apple-darwin = -Wl,-install_name,@rpath/$(1)
179+
CFG_LIBUV_LINK_FLAGS_arm-apple-darwin =
180+
CFG_EXE_SUFFIX_arm-apple-darwin :=
181+
CFG_WINDOWSY_arm-apple-darwin :=
182+
CFG_UNIXY_arm-apple-darwin := 1
183+
CFG_PATH_MUNGE_arm-apple-darwin := true
184+
CFG_LDPATH_arm-apple-darwin :=
185+
CFG_RUN_arm-apple-darwin = $(2)
186+
CFG_RUN_TARG_arm-apple-darwin = $(call CFG_RUN_arm-apple-darwin,,$(2))
168187
endif
169-
CFG_LIB_NAME_arm-apple-ios = lib$(1).a
170-
CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
171-
CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
172-
CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
173-
CFG_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
174-
CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
175-
CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
176-
CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
177-
CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
178-
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
179-
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
180-
CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
181-
CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
182-
CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
183-
CFG_LIBUV_LINK_FLAGS_arm-apple-ios =
184-
CFG_EXE_SUFFIX_arm-apple-ios :=
185-
CFG_WINDOWSY_arm-apple-ios :=
186-
CFG_UNIXY_arm-apple-ios := 1
187-
CFG_PATH_MUNGE_arm-apple-ios := true
188-
CFG_LDPATH_arm-apple-ios :=
189-
CFG_RUN_arm-apple-ios = $(2)
190-
CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
191-
RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
192-
RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
193-
194-
# i386-apple-ios configuration
195-
CFG_SDK_NAME_i386-apple-ios = iphonesimulator
196-
CFG_SDK_ARCHS_i386-apple-ios = i386
197-
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
198-
CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
199-
CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
200-
CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
201-
CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
202-
CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
203-
AR_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
204-
endif
205-
CFG_LIB_NAME_i386-apple-ios = lib$(1).a
206-
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
207-
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
208-
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
209-
CFG_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS)
210-
CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
211-
CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
212-
CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
213-
CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
214-
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
215-
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
216-
CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
217-
CFG_LLC_FLAGS_i386-apple-ios =
218-
CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
219-
CFG_LIBUV_LINK_FLAGS_i386-apple-ios =
220-
CFG_EXE_SUFFIX_i386-apple-ios =
221-
CFG_WINDOWSY_i386-apple-ios =
222-
CFG_UNIXY_i386-apple-ios = 1
223-
CFG_PATH_MUNGE_i386-apple-ios = true
224-
CFG_LDPATH_i386-apple-ios =
225-
CFG_RUN_i386-apple-ios = $(2)
226-
CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
227-
CFG_JEMALLOC_CFLAGS_i386-apple-ios = -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
228188

229189
# x86_64-apple-darwin configuration
230190
CC_x86_64-apple-darwin=$(CC)

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

Lines changed: 6 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ ifeq ($$(CFG_WINDOWSY_$(1)), 1)
166166
JEMALLOC_ARGS_$(1) := --enable-lazy-lock
167167
else ifeq ($(OSTYPE_$(1)), apple-darwin)
168168
LIBUV_OSTYPE_$(1) := mac
169-
else ifeq ($(OSTYPE_$(1)), apple-ios)
170-
LIBUV_OSTYPE_$(1) := ios
171-
JEMALLOC_ARGS_$(1) := --disable-tls
172169
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
173170
LIBUV_OSTYPE_$(1) := freebsd
174171
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
@@ -184,8 +181,6 @@ LIBUV_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/libuv
184181
LIBUV_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(LIBUV_NAME_$(1))
185182

186183
LIBUV_MAKEFILE_$(1) := $$(CFG_BUILD_DIR)$$(RT_OUTPUT_DIR_$(1))/libuv/Makefile
187-
LIBUV_BUILD_DIR_$(1) := $$(CFG_BUILD_DIR)$$(RT_OUTPUT_DIR_$(1))/libuv
188-
LIBUV_XCODEPROJ_$(1) := $$(LIBUV_BUILD_DIR_$(1))/uv.xcodeproj
189184

190185
LIBUV_STAMP_$(1) = $$(LIBUV_DIR_$(1))/libuv-auto-clean-stamp
191186

@@ -217,30 +212,6 @@ $$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS)
217212
CXX="$$(CXX_$(1))" \
218213
AR="$$(AR_$(1))" \
219214
V=$$(VERBOSE)
220-
else ifeq ($(OSTYPE_$(1)), apple-ios) # iOS
221-
$$(LIBUV_XCODEPROJ_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1))
222-
cp -rf $(S)src/libuv/ $$(LIBUV_BUILD_DIR_$(1))
223-
(cd $$(LIBUV_BUILD_DIR_$(1)) && \
224-
$$(CFG_PYTHON) ./gyp_uv.py -f xcode \
225-
-D ninja \
226-
-R libuv)
227-
touch $$@
228-
229-
LIBUV_XCODE_OUT_LIB_$(1) := $$(LIBUV_BUILD_DIR_$(1))/build/Release-$$(CFG_SDK_NAME_$(1))/libuv.a
230-
231-
$$(LIBUV_LIB_$(1)): $$(LIBUV_XCODE_OUT_LIB_$(1)) $$(MKFILE_DEPS)
232-
$$(Q)cp $$< $$@
233-
$$(LIBUV_XCODE_OUT_LIB_$(1)): $$(LIBUV_DEPS) $$(LIBUV_XCODEPROJ_$(1)) \
234-
$$(MKFILE_DEPS)
235-
$$(Q)xcodebuild -project $$(LIBUV_BUILD_DIR_$(1))/uv.xcodeproj \
236-
CFLAGS="$$(LIBUV_CFLAGS_$(1)) $$(SNAP_DEFINES)" \
237-
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS_$(1))" \
238-
$$(LIBUV_ARGS_$(1)) \
239-
V=$$(VERBOSE) \
240-
-configuration Release \
241-
-sdk "$$(CFG_SDK_NAME_$(1))" \
242-
ARCHS="$$(CFG_SDK_ARCHS_$(1))"
243-
$$(Q)touch $$@
244215
else
245216
LIBUV_LOCAL_$(1) := $$(LIBUV_DIR_$(1))/Release/libuv.a
246217
$$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) $$(MKFILE_DEPS)
@@ -255,6 +226,7 @@ $$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) $$(MKFILE_DEPS)
255226
NO_LOAD="$$(LIBUV_NO_LOAD)" \
256227
V=$$(VERBOSE)
257228
$$(Q)touch $$@
229+
258230
endif
259231

260232
ifeq ($(1),$$(CFG_BUILD))
@@ -297,17 +269,15 @@ JEMALLOC_LOCAL_$(1) := $$(JEMALLOC_BUILD_DIR_$(1))/lib/$$(JEMALLOC_REAL_NAME_$(1
297269
$$(JEMALLOC_LOCAL_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
298270
@$$(call E, make: jemalloc)
299271
cd "$$(JEMALLOC_BUILD_DIR_$(1))"; "$(S)src/jemalloc/configure" \
300-
$$(JEMALLOC_ARGS_$(1)) --with-jemalloc-prefix=je_ \
301-
--build=$(CFG_BUILD) --host=$(1) \
272+
$$(JEMALLOC_ARGS_$(1)) --enable-cc-silence --with-jemalloc-prefix=je_ \
273+
--disable-experimental --build=$(CFG_BUILD) --host=$(1) \
302274
CC="$$(CC_$(1))" \
303275
AR="$$(AR_$(1))" \
304276
RANLIB="$$(AR_$(1)) s" \
305277
CPPFLAGS="-I $(S)src/rt/" \
306-
EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) $$(CFG_JEMALLOC_CFLAGS_$(1)) -g1"
278+
EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1)) -g1"
307279
$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
308280

309-
ifeq ($$(CFG_DISABLE_JEMALLOC),)
310-
RUSTFLAGS_alloc := --cfg jemalloc
311281
ifeq ($(1),$$(CFG_BUILD))
312282
ifneq ($$(CFG_JEMALLOC_ROOT),)
313283
$$(JEMALLOC_LIB_$(1)): $$(CFG_JEMALLOC_ROOT)/libjemalloc_pic.a
@@ -321,10 +291,6 @@ else
321291
$$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_LOCAL_$(1))
322292
$$(Q)cp $$< $$@
323293
endif
324-
else
325-
$$(JEMALLOC_LIB_$(1)): $$(MKFILE_DEPS)
326-
$$(Q)touch $$@
327-
endif
328294

329295
################################################################################
330296
# compiler-rt
@@ -369,22 +335,15 @@ BACKTRACE_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),backtrace)
369335
BACKTRACE_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(BACKTRACE_NAME_$(1))
370336
BACKTRACE_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/libbacktrace
371337

338+
ifeq ($$(findstring darwin,$$(OSTYPE_$(1))),darwin)
339+
372340
# We don't use this on platforms that aren't linux-based, so just make the file
373341
# available, the compilation of libstd won't actually build it.
374-
ifeq ($$(findstring darwin,$$(OSTYPE_$(1))),darwin)
375-
# See comment above
376342
$$(BACKTRACE_LIB_$(1)):
377343
touch $$@
378344

379345
else
380-
ifeq ($$(findstring ios,$$(OSTYPE_$(1))),ios)
381-
# See comment above
382-
$$(BACKTRACE_LIB_$(1)):
383-
touch $$@
384-
else
385-
386346
ifeq ($$(CFG_WINDOWSY_$(1)),1)
387-
# See comment above
388347
$$(BACKTRACE_LIB_$(1)):
389348
touch $$@
390349
else
@@ -429,7 +388,6 @@ $$(BACKTRACE_LIB_$(1)): $$(BACKTRACE_BUILD_DIR_$(1))/Makefile $$(MKFILE_DEPS)
429388
$$(Q)cp $$(BACKTRACE_BUILD_DIR_$(1))/.libs/libbacktrace.a $$@
430389

431390
endif # endif for windowsy
432-
endif # endif for ios
433391
endif # endif for darwin
434392

435393
endef

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
8484
-L "$$(RT_OUTPUT_DIR_$(2))" \
8585
-L "$$(LLVM_LIBDIR_$(2))" \
8686
-L "$$(dir $$(LLVM_STDCPP_LOCATION_$(2)))" \
87-
$$(RUSTFLAGS_$(4)) \
8887
--out-dir $$(@D) $$<
8988
@touch $$@
9089
$$(call LIST_ALL_OLD_GLOB_MATCHES,\

0 commit comments

Comments
 (0)