Skip to content

Commit 0adb52d

Browse files
borsbors
committed
---
yaml --- r: 161269 b: refs/heads/snap-stage3 c: 5acb97a h: refs/heads/master i: 161267: fbb7725 v: v3
1 parent 40c0706 commit 0adb52d

File tree

965 files changed

+23592
-23802
lines changed

Some content is hidden

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

965 files changed

+23592
-23802
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: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f3bd844d2aed3465f8e90417b53482ec70a83521
4+
refs/heads/snap-stage3: 5acb97ae76aeaeed9b4d78a613aa448ea815d74e
55
refs/heads/try: 0f0d21c1eb5c7be04d323e0b06faf252ad790af6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/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]>

‎branches/snap-stage3/configure

Lines changed: 30 additions & 8 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
@@ -701,11 +715,6 @@ then
701715
fi
702716
step_msg "using rustc at: ${CFG_LOCAL_RUST_ROOT} with version: $LRV"
703717
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
709718
fi
710719

711720
# Force freebsd to build with clang; gcc doesn't like us there
@@ -883,7 +892,10 @@ CFG_PREFIX=${CFG_PREFIX%/}
883892
CFG_MANDIR=${CFG_MANDIR%/}
884893
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
885894
CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
886-
CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
895+
CFG_SUPPORTED_TARGET=""
896+
for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
897+
CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
898+
done
887899

888900
# copy host-triples to target-triples so that hosts are a subset of targets
889901
V_TEMP=""
@@ -989,6 +1001,15 @@ for h in $CFG_HOST
9891001
do
9901002
for t in $CFG_TARGET
9911003
do
1004+
# host lib dir stage0
1005+
make_dir $h/stage0/lib
1006+
1007+
# target bin dir stage0
1008+
make_dir $h/stage0/lib/rustlib/$t/bin
1009+
1010+
# target lib dir stage0
1011+
make_dir $h/stage0/lib/rustlib/$t/lib
1012+
9921013
for i in 0 1 2 3
9931014
do
9941015
# host bin dir
@@ -1031,6 +1052,7 @@ do
10311052
make_dir $h/test/doc-guide-tasks
10321053
make_dir $h/test/doc-guide-plugin
10331054
make_dir $h/test/doc-guide-crates
1055+
make_dir $h/test/doc-guide-error-handling
10341056
make_dir $h/test/doc-rust
10351057
done
10361058

‎branches/snap-stage3/mk/cfg/arm-apple-ios renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/arm-linux-androideabi renamed to ‎branches/snap-stage3/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++

‎branches/snap-stage3/mk/cfg/arm-unknown-linux-gnueabi renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/arm-unknown-linux-gnueabihf renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/i386-apple-ios renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/i686-apple-darwin renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/i686-pc-windows-gnu renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/i686-unknown-linux-gnu renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/mips-unknown-linux-gnu renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/mipsel-unknown-linux-gnu renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/x86_64-apple-darwin renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/x86_64-pc-windows-gnu renamed to ‎branches/snap-stage3/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

‎branches/snap-stage3/mk/cfg/x86_64-unknown-dragonfly renamed to ‎branches/snap-stage3/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=

‎branches/snap-stage3/mk/cfg/x86_64-unknown-freebsd renamed to ‎branches/snap-stage3/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=

‎branches/snap-stage3/mk/cfg/x86_64-unknown-linux-gnu renamed to ‎branches/snap-stage3/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

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

Lines changed: 10 additions & 11 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,11 +49,11 @@
4949
# automatically generated for all stage/host/target combinations.
5050
################################################################################
5151

52-
TARGET_CRATES := libc std green native flate arena term \
52+
TARGET_CRATES := libc std flate arena term \
5353
serialize sync getopts collections test time rand \
5454
log regex graphviz core rbml alloc rustrt \
5555
unicode
56-
HOST_CRATES := syntax rustc rustdoc regex_macros fmt_macros \
56+
HOST_CRATES := syntax rustc rustc_trans rustdoc regex_macros fmt_macros \
5757
rustc_llvm rustc_back
5858
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5959
TOOLS := compiletest rustdoc rustc
@@ -66,14 +66,13 @@ DEPS_rustrt := alloc core libc collections native:rustrt_native
6666
DEPS_std := core libc rand alloc collections rustrt sync unicode \
6767
native:rust_builtin native:backtrace
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_trans := rustc rustc_back rustc_llvm libc
7271
DEPS_rustc := syntax flate arena serialize getopts rbml \
7372
time log graphviz rustc_llvm rustc_back
7473
DEPS_rustc_llvm := native:rustllvm libc std
7574
DEPS_rustc_back := std syntax rustc_llvm flate log libc
76-
DEPS_rustdoc := rustc native:hoedown serialize getopts \
75+
DEPS_rustdoc := rustc rustc_trans native:hoedown serialize getopts \
7776
test time
7877
DEPS_flate := std native:miniz
7978
DEPS_arena := std
@@ -94,9 +93,9 @@ DEPS_regex := std
9493
DEPS_regex_macros = rustc syntax std regex
9594
DEPS_fmt_macros = std
9695

97-
TOOL_DEPS_compiletest := test getopts native
98-
TOOL_DEPS_rustdoc := rustdoc native
99-
TOOL_DEPS_rustc := rustc native
96+
TOOL_DEPS_compiletest := test getopts
97+
TOOL_DEPS_rustdoc := rustdoc
98+
TOOL_DEPS_rustc := rustc_trans
10099
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
101100
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
102101
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
@@ -112,8 +111,8 @@ ONLY_RLIB_unicode := 1
112111
# You should not need to edit below this line
113112
################################################################################
114113

115-
DOC_CRATES := $(filter-out rustc, $(filter-out syntax, $(CRATES)))
116-
COMPILER_DOC_CRATES := rustc syntax
114+
DOC_CRATES := $(filter-out rustc, $(filter-out rustc_trans, $(filter-out syntax, $(CRATES))))
115+
COMPILER_DOC_CRATES := rustc rustc_trans syntax
117116

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
######################################################################
2828
DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
2929
guide-tasks guide-container guide-pointers guide-testing \
30-
guide-plugin guide-crates complement-bugreport \
30+
guide-plugin guide-crates complement-bugreport guide-error-handling \
3131
complement-lang-faq complement-design-faq complement-project-faq \
3232
rustdoc guide-unsafe guide-strings reference
3333

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,25 @@ endef
3030
$(BG):
3131
$(Q)mkdir -p $(BG)
3232

33-
$(BG)RustLexer.class: $(SG)RustLexer.g4
33+
$(BG)RustLexer.class: $(BG) $(SG)RustLexer.g4
3434
$(Q)$(CFG_ANTLR4) -o $(B)grammar $(SG)RustLexer.g4
3535
$(Q)$(CFG_JAVAC) -d $(BG) $(BG)RustLexer.java
3636

37-
$(BG)verify: $(SG)verify.rs rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc
38-
$(Q)$(RUSTC) -O --out-dir $(BG) -L $(L) $(SG)verify.rs
37+
check-build-lexer-verifier: $(BG)verify
38+
39+
ifeq ($(NO_REBUILD),)
40+
VERIFY_DEPS := rustc-stage2-H-$(CFG_BUILD) $(LD)stamp.regex_macros $(LD)stamp.rustc
41+
else
42+
VERIFY_DEPS :=
43+
endif
44+
45+
$(BG)verify: $(BG) $(SG)verify.rs $(VERIFY_DEPS)
46+
$(Q)$(RUSTC) --out-dir $(BG) -L $(L) $(SG)verify.rs
3947

4048
ifdef CFG_JAVAC
4149
ifdef CFG_ANTLR4
4250
ifdef CFG_GRUN
43-
check-lexer: $(BG) $(BG)RustLexer.class $(BG)verify
51+
check-lexer: $(BG) $(BG)RustLexer.class check-build-lexer-verifier
4452
$(info Verifying libsyntax against the reference lexer ...)
4553
$(Q)$(SG)check.sh $(S) "$(BG)" \
4654
"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,14 @@ endif
190190
# Target-and-rule "utility variables"
191191
######################################################################
192192

193-
define DEF_X
193+
define DEF_FOR_TARGET
194194
X_$(1) := $(CFG_EXE_SUFFIX_$(1))
195+
ifndef CFG_LLVM_TARGET_$(1)
196+
CFG_LLVM_TARGET_$(1) := $(1)
197+
endif
195198
endef
196199
$(foreach target,$(CFG_TARGET), \
197-
$(eval $(call DEF_X,$(target))))
200+
$(eval $(call DEF_FOR_TARGET,$(target))))
198201

199202
# "Source" files we generate in builddir along the way.
200203
GENERATED :=
@@ -332,7 +335,15 @@ define SREQ
332335
# Destinations of artifacts for the host compiler
333336
HROOT$(1)_H_$(3) = $(3)/stage$(1)
334337
HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
338+
ifeq ($$(CFG_WINDOWSY_$(3)),1)
339+
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
340+
else
341+
ifeq ($(1),0)
342+
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
343+
else
335344
HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
345+
endif
346+
endif
336347

337348
# Destinations of artifacts for target architectures
338349
TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ $(foreach cvar,CC CXX CPP CFLAGS CXXFLAGS CPPFLAGS, \
113113

114114
CFG_RLIB_GLOB=lib$(1)-*.rlib
115115

116-
include $(wildcard $(CFG_SRC_DIR)mk/cfg/*)
116+
include $(wildcard $(CFG_SRC_DIR)mk/cfg/*.mk)
117117

118118
# The -Qunused-arguments sidesteps spurious warnings from clang
119119
define FILTER_FLAGS

0 commit comments

Comments
 (0)