Skip to content

Commit 2276785

Browse files
baroslbarosl
committed
Merge rust-lang#19216 into rollup
Approved-by:
2 parents 6f7081f + f1a783c commit 2276785

File tree

1,784 files changed

+82308
-75637
lines changed

Some content is hidden

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

1,784 files changed

+82308
-75637
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@
1111
[submodule "src/jemalloc"]
1212
path = src/jemalloc
1313
url = https://github.com/rust-lang/jemalloc.git
14+
[submodule "src/rust-installer"]
15+
path = src/rust-installer
16+
url = https://github.com/rust-lang/rust-installer

‎AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ Cole Mickens <[email protected]>
121121
Colin Davidson <[email protected]>
122122
Colin Sherratt <[email protected]>
123123
Conrad Kleinespel <[email protected]>
124+
Corey Farwell <[email protected]>
124125
Corey Ford <[email protected]>
125126
Corey Richardson <[email protected]>
126127
DJUrsus <[email protected]>

‎Makefile.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ include $(CFG_SRC_DIR)mk/rustllvm.mk
198198
include $(CFG_SRC_DIR)mk/docs.mk
199199
# LLVM
200200
include $(CFG_SRC_DIR)mk/llvm.mk
201+
# Rules for installing debugger scripts
202+
include $(CFG_SRC_DIR)mk/debuggers.mk
201203

202204
######################################################################
203205
# Secondary makefiles, conditionalized for speed

‎configure

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,27 @@ CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
546546
# there's no rpath. This is where the build system itself puts libraries;
547547
# --libdir is used to configure the installation directory.
548548
# FIXME: This needs to parameterized over target triples. Do it in platform.mk
549-
CFG_LIBDIR_RELATIVE=lib
550549
if [ "$CFG_OSTYPE" = "pc-windows-gnu" ]
551550
then
552551
CFG_LIBDIR_RELATIVE=bin
552+
else
553+
CFG_LIBDIR_RELATIVE=lib
553554
fi
554555

555-
valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries"
556+
valopt libdir "${CFG_PREFIX}/${CFG_LIBDIR_RELATIVE}" "install libraries (do not set it on windows platform)"
557+
558+
case "$CFG_LIBDIR" in
559+
"$CFG_PREFIX"/*) CAT_INC=2;;
560+
"$CFG_PREFIX"*) CAT_INC=1;;
561+
*)
562+
err "libdir must begin with the prefix. Use --prefix to set it accordingly.";;
563+
esac
564+
565+
CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
566+
567+
if [ "$CFG_OSTYPE" = "pc-windows-gnu" ] && [ "$CFG_LIBDIR_RELATIVE" != "bin" ]; then
568+
err "libdir on windows should be set to 'bin'"
569+
fi
556570

557571
if [ $HELP -eq 1 ]
558572
then
@@ -610,7 +624,6 @@ probe CFG_LD ld
610624
probe CFG_VALGRIND valgrind
611625
probe CFG_PERF perf
612626
probe CFG_ISCC iscc
613-
probe CFG_LLNEXTGEN LLnextgen
614627
probe CFG_JAVAC javac
615628
probe CFG_ANTLR4 antlr4
616629
probe CFG_GRUN grun
@@ -701,11 +714,6 @@ then
701714
fi
702715
step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
703716
putvar CFG_LOCAL_RUST_ROOT
704-
else
705-
if [ ! -z "$CFG_LOCAL_RUST_ROOT" ]
706-
then
707-
warn "Use of --local-rust-root without --enable-local-rust"
708-
fi
709717
fi
710718

711719
# Force freebsd to build with clang; gcc doesn't like us there
@@ -883,7 +891,10 @@ CFG_PREFIX=${CFG_PREFIX%/}
883891
CFG_MANDIR=${CFG_MANDIR%/}
884892
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
885893
CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
886-
CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
894+
CFG_SUPPORTED_TARGET=""
895+
for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
896+
CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
897+
done
887898

888899
# copy host-triples to target-triples so that hosts are a subset of targets
889900
V_TEMP=""
@@ -977,8 +988,7 @@ do
977988
make_dir $t/rt/jemalloc
978989
for i in \
979990
isaac sync test \
980-
arch/i386 arch/x86_64 arch/arm arch/mips \
981-
sundown/src sundown/html
991+
arch/i386 arch/x86_64 arch/arm arch/mips
982992
do
983993
make_dir $t/rt/stage$s/$i
984994
done
@@ -989,6 +999,15 @@ for h in $CFG_HOST
989999
do
9901000
for t in $CFG_TARGET
9911001
do
1002+
# host lib dir stage0
1003+
make_dir $h/stage0/lib
1004+
1005+
# target bin dir stage0
1006+
make_dir $h/stage0/lib/rustlib/$t/bin
1007+
1008+
# target lib dir stage0
1009+
make_dir $h/stage0/lib/rustlib/$t/lib
1010+
9921011
for i in 0 1 2 3
9931012
do
9941013
# host bin dir
@@ -1020,18 +1039,18 @@ do
10201039
make_dir $h/test/debuginfo-gdb
10211040
make_dir $h/test/debuginfo-lldb
10221041
make_dir $h/test/codegen
1023-
make_dir $h/test/doc-tutorial
10241042
make_dir $h/test/doc-guide
10251043
make_dir $h/test/doc-guide-ffi
10261044
make_dir $h/test/doc-guide-runtime
10271045
make_dir $h/test/doc-guide-macros
1028-
make_dir $h/test/doc-guide-lifetimes
1046+
make_dir $h/test/doc-guide-ownership
10291047
make_dir $h/test/doc-guide-pointers
10301048
make_dir $h/test/doc-guide-container
10311049
make_dir $h/test/doc-guide-tasks
10321050
make_dir $h/test/doc-guide-plugin
10331051
make_dir $h/test/doc-guide-crates
1034-
make_dir $h/test/doc-rust
1052+
make_dir $h/test/doc-guide-error-handling
1053+
make_dir $h/test/doc-reference
10351054
done
10361055

10371056
# Configure submodules

‎mk/cfg/arm-apple-ios renamed to ‎mk/cfg/arm-apple-ios.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CFG_LIB_NAME_arm-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
1414
CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
1515
CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
16-
CFG_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
16+
CFG_JEMALLOC_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
1717
CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
1818
CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
1919
CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind

‎mk/cfg/arm-linux-androideabi renamed to ‎mk/cfg/arm-linux-androideabi.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
77
CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
88
CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
1212
CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++

‎mk/cfg/arm-unknown-linux-gnueabi renamed to ‎mk/cfg/arm-unknown-linux-gnueabi.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
88
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
99
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
1010
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
11-
CFG_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp $(CFLAGS)
1212
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g

‎mk/cfg/arm-unknown-linux-gnueabihf renamed to ‎mk/cfg/arm-unknown-linux-gnueabihf.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
88
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
99
CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
1010
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
11-
CFG_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS)
1212
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g

‎mk/cfg/i386-apple-ios renamed to ‎mk/cfg/i386-apple-ios.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CFG_LIB_NAME_i386-apple-ios = lib$(1).a
1313
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
1414
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
1515
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
16-
CFG_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS)
1716
CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
1817
CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
1918
CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
@@ -30,5 +29,5 @@ CFG_PATH_MUNGE_i386-apple-ios = true
3029
CFG_LDPATH_i386-apple-ios =
3130
CFG_RUN_i386-apple-ios = $(2)
3231
CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
33-
CFG_JEMALLOC_CFLAGS_i386-apple-ios = -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
32+
CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
3433
CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios

‎mk/cfg/i686-apple-darwin renamed to ‎mk/cfg/i686-apple-darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
77
CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a
88
CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
99
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_i686-apple-darwin := -m32 -arch i386 $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_i686-apple-darwin := -m32 -arch i386 $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386 $(CFLAGS)
1212
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread -framework CoreServices -m32

‎mk/cfg/i686-pc-windows-gnu renamed to ‎mk/cfg/i686-pc-windows-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CFG_LIB_NAME_i686-pc-windows-gnu=$(1).dll
88
CFG_STATIC_LIB_NAME_i686-pc-windows-gnu=$(1).lib
99
CFG_LIB_GLOB_i686-pc-windows-gnu=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_i686-pc-windows-gnu=$(1)-*.dylib.dSYM
11-
CFG_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1212
CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_i686-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_i686-pc-windows-gnu := -shared -g -m32

‎mk/cfg/i686-unknown-linux-gnu renamed to ‎mk/cfg/i686-unknown-linux-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
77
CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
88
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
1212
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32

‎mk/cfg/mips-unknown-linux-gnu renamed to ‎mk/cfg/mips-unknown-linux-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
77
CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a
88
CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS)
1212
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32

‎mk/cfg/mipsel-unknown-linux-gnu renamed to ‎mk/cfg/mipsel-unknown-linux-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).so
77
CFG_STATIC_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).a
88
CFG_LIB_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_mipsel-unknown-linux-gnu := -mips32 -mabi=32 $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_mipsel-unknown-linux-gnu := -mips32 -mabi=32 $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_mipsel-unknown-linux-gnu := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS)
1212
CFG_GCCISH_CXXFLAGS_mipsel-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_mipsel-unknown-linux-gnu := -shared -fPIC -g -mips32

‎mk/cfg/x86_64-apple-darwin renamed to ‎mk/cfg/x86_64-apple-darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
77
CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a
88
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
99
CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64 $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64 $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64 $(CFLAGS)
1212
CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread -framework CoreServices -m64

‎mk/cfg/x86_64-pc-windows-gnu renamed to ‎mk/cfg/x86_64-pc-windows-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CFG_LIB_NAME_x86_64-pc-windows-gnu=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-gnu=$(1).lib
99
CFG_LIB_GLOB_x86_64-pc-windows-gnu=$(1)-*.dll
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-gnu=$(1)-*.dylib.dSYM
11-
CFG_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
11+
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1212
CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
1313
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
1414
CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-gnu := -shared -g -m64

‎mk/cfg/x86_64-unknown-dragonfly renamed to ‎mk/cfg/x86_64-unknown-dragonfly.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).so
77
CFG_STATIC_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).a
88
CFG_LIB_GLOB_x86_64-unknown-dragonfly=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_x86_64-unknown-dragonfly=$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_x86_64-unknown-dragonfly := -I/usr/include -I/usr/local/include $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_x86_64-unknown-dragonfly := -I/usr/include -I/usr/local/include $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_x86_64-unknown-dragonfly := -Wall -Werror -g -fPIC -I/usr/include -I/usr/local/include $(CFLAGS)
1212
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-dragonfly := -shared -fPIC -g -pthread -lrt
1313
CFG_GCCISH_DEF_FLAG_x86_64-unknown-dragonfly := -Wl,--export-dynamic,--dynamic-list=

‎mk/cfg/x86_64-unknown-freebsd renamed to ‎mk/cfg/x86_64-unknown-freebsd.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
77
CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a
88
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include $(CFLAGS)
10+
CFG_JEMALLOC_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include $(CFLAGS)
1111
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include $(CFLAGS)
1212
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt
1313
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=

‎mk/cfg/x86_64-unknown-linux-gnu renamed to ‎mk/cfg/x86_64-unknown-linux-gnu.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CFG_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).so
77
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).a
88
CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
10-
CFG_CFLAGS_x86_64-unknown-linux-gnu := -m64
10+
CFG_JEMALLOC_CFLAGS_x86_64-unknown-linux-gnu := -m64
1111
CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
1212
CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
1313
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m64

‎mk/clean.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ clean-generic-$(2)-$(1):
6363
-name '*.lib' -o \
6464
-name '*.dll' -o \
6565
-name '*.def' -o \
66+
-name '*.py' -o \
6667
-name '*.bc' \
6768
\) \
6869
| xargs rm -f
@@ -78,7 +79,7 @@ define CLEAN_HOST_STAGE_N
7879

7980
clean$(1)_H_$(2): \
8081
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
81-
$$(foreach tool,$$(TOOLS),clean$(1)_H_$(2)-tool-$$(tool))
82+
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_H_$(2)-tool-$$(tool))
8283
$$(Q)rm -fr $(2)/rt/libbacktrace
8384

8485
clean$(1)_H_$(2)-tool-%:
@@ -98,7 +99,7 @@ define CLEAN_TARGET_STAGE_N
9899

99100
clean$(1)_T_$(2)_H_$(3): \
100101
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
101-
$$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
102+
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
102103
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
103104
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a
104105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/librun_pass_stage* # For unix

‎mk/crates.mk

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#
3838
# DEPS_<crate>
3939
# These lists are the dependencies of the <crate> that is to be built.
40-
# Rust dependencies are listed bare (i.e. std, green) and native
40+
# Rust dependencies are listed bare (i.e. std) and native
4141
# dependencies have a "native:" prefix (i.e. native:hoedown). All deps
4242
# will be built before the crate itself is built.
4343
#
@@ -49,31 +49,36 @@
4949
# automatically generated for all stage/host/target combinations.
5050
################################################################################
5151

52-
TARGET_CRATES := libc std green native flate arena term \
53-
serialize sync getopts collections test time rand \
54-
log regex graphviz core rbml alloc rustrt \
52+
TARGET_CRATES := libc std flate arena term \
53+
serialize getopts collections test time rand \
54+
log regex graphviz core rbml alloc \
5555
unicode
56-
HOST_CRATES := syntax rustc rustdoc regex_macros fmt_macros \
57-
rustc_llvm rustc_back
56+
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
57+
rustc_trans rustc_back rustc_llvm
58+
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc regex_macros fmt_macros
5859
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5960
TOOLS := compiletest rustdoc rustc
6061

6162
DEPS_core :=
6263
DEPS_libc := core
6364
DEPS_unicode := core
6465
DEPS_alloc := core libc native:jemalloc
65-
DEPS_rustrt := alloc core libc collections native:rustrt_native
66-
DEPS_std := core libc rand alloc collections rustrt sync unicode \
67-
native:rust_builtin native:backtrace
66+
DEPS_std := core libc rand alloc collections unicode \
67+
native:rust_builtin native:backtrace native:rustrt_native
6868
DEPS_graphviz := std
69-
DEPS_green := std native:context_switch
70-
DEPS_native := std
7169
DEPS_syntax := std term serialize log fmt_macros arena libc
70+
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+
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
73+
log syntax serialize rustc_llvm
74+
DEPS_rustc_typeck := rustc syntax
75+
DEPS_rustc_borrowck := rustc log graphviz syntax
76+
DEPS_rustc_resolve := rustc log syntax
7277
DEPS_rustc := syntax flate arena serialize getopts rbml \
7378
time log graphviz rustc_llvm rustc_back
7479
DEPS_rustc_llvm := native:rustllvm libc std
7580
DEPS_rustc_back := std syntax rustc_llvm flate log libc
76-
DEPS_rustdoc := rustc native:hoedown serialize getopts \
81+
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
7782
test time
7883
DEPS_flate := std native:miniz
7984
DEPS_arena := std
@@ -82,7 +87,6 @@ DEPS_glob := std
8287
DEPS_serialize := std log
8388
DEPS_rbml := std log serialize
8489
DEPS_term := std log
85-
DEPS_sync := core alloc rustrt collections
8690
DEPS_getopts := std
8791
DEPS_collections := core alloc unicode
8892
DEPS_num := std
@@ -94,9 +98,9 @@ DEPS_regex := std
9498
DEPS_regex_macros = rustc syntax std regex
9599
DEPS_fmt_macros = std
96100

97-
TOOL_DEPS_compiletest := test getopts native
98-
TOOL_DEPS_rustdoc := rustdoc native
99-
TOOL_DEPS_rustc := rustc native
101+
TOOL_DEPS_compiletest := test getopts
102+
TOOL_DEPS_rustdoc := rustdoc
103+
TOOL_DEPS_rustc := rustc_driver
100104
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
101105
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
102106
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
@@ -112,8 +116,15 @@ ONLY_RLIB_unicode := 1
112116
# You should not need to edit below this line
113117
################################################################################
114118

115-
DOC_CRATES := $(filter-out rustc, $(filter-out syntax, $(CRATES)))
116-
COMPILER_DOC_CRATES := rustc syntax
119+
DOC_CRATES := $(filter-out rustc, \
120+
$(filter-out rustc_trans, \
121+
$(filter-out rustc_typeck, \
122+
$(filter-out rustc_borrowck, \
123+
$(filter-out rustc_resolve, \
124+
$(filter-out rustc_driver, \
125+
$(filter-out syntax, $(CRATES))))))))
126+
COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \
127+
rustc_typeck rustc_driver syntax
117128

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

0 commit comments

Comments
 (0)