Skip to content

Commit 6af0ab5

Browse files
borsbors
committed
---
yaml --- r: 278275 b: refs/tags/homu-tmp c: 41f3d25 h: refs/heads/master i: 278273: 193d801 278271: 1e09da3
1 parent 72d9f57 commit 6af0ab5

File tree

781 files changed

+15482
-9524
lines changed

Some content is hidden

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

781 files changed

+15482
-9524
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ refs/heads/beta: 87cb733048f0072199b66bb3c0efe61d52623900
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
30-
refs/tags/homu-tmp: b52d76a08528273b218f168753ed846ecfb59aec
30+
refs/tags/homu-tmp: 41f3d25f4ed3aa9beefdafa4e81036a15677026a
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
3232
refs/heads/stable: db2939409db26ab4904372c82492cd3488e4c44e
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375

‎tags/homu-tmp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Read ["Installing Rust"] from [The Book].
1616

1717
1. Make sure you have installed the dependencies:
1818

19-
* `g++` 4.7 or `clang++` 3.x
19+
* `g++` 4.7 or later or `clang++` 3.x
2020
* `python` 2.7 (but not 3.x)
2121
* GNU `make` 3.81 or later
2222
* `curl`

‎tags/homu-tmp/configure

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,6 +1453,19 @@ then
14531453
cd ${CFG_BUILD_DIR}
14541454
fi
14551455

1456+
# Do a sanity check that the submodule source exists. Because GitHub
1457+
# automatically publishes broken tarballs that can't be disabled, and
1458+
# people download them and try to use them.
1459+
if [ ! -e "${CFG_SRC_DIR}/src/liblibc" ]; then
1460+
err "some submodules are missing. Is this a broken tarball?
1461+
1462+
If you downloaded this tarball from the GitHub release pages at
1463+
https://github.com/rust-lang/rust/releases,
1464+
then please delete it and instead download the source from
1465+
https://www.rust-lang.org/downloads.html"
1466+
1467+
fi
1468+
14561469
# Configure llvm, only if necessary
14571470
step_msg "looking at LLVM"
14581471
CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/

‎tags/homu-tmp/mk/cfg/i586-pc-windows-msvc.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# i586-pc-windows-msvc configuration
2-
CC_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
3-
LINK_i586-pc-windows-msvc="$(CFG_MSVC_LINK_i386)" -nologo
4-
CXX_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
5-
CPP_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
6-
AR_i586-pc-windows-msvc="$(CFG_MSVC_LIB_i386)" -nologo
2+
CC_i586-pc-windows-msvc=$(CFG_MSVC_CL_i386)
3+
LINK_i586-pc-windows-msvc=$(CFG_MSVC_LINK_i386)
4+
CXX_i586-pc-windows-msvc=$(CFG_MSVC_CL_i386)
5+
CPP_i586-pc-windows-msvc=$(CFG_MSVC_CL_i386)
6+
AR_i586-pc-windows-msvc=$(CFG_MSVC_LIB_i386)
77
CFG_LIB_NAME_i586-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_i586-pc-windows-msvc=$(1).lib
99
CFG_LIB_GLOB_i586-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_i586-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_i586-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_i586-pc-windows-msvc := -MD -arch:IA32
13-
CFG_GCCISH_CXXFLAGS_i586-pc-windows-msvc := -MD -arch:IA32
12+
CFG_GCCISH_CFLAGS_i586-pc-windows-msvc := -MD -arch:IA32 -nologo
13+
CFG_GCCISH_CXXFLAGS_i586-pc-windows-msvc := -MD -arch:IA32 -nologo
1414
CFG_GCCISH_LINK_FLAGS_i586-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_i586-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_i586-pc-windows-msvc :=

‎tags/homu-tmp/mk/cfg/i686-pc-windows-msvc.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# i686-pc-windows-msvc configuration
2-
CC_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
3-
LINK_i686-pc-windows-msvc="$(CFG_MSVC_LINK_i386)" -nologo
4-
CXX_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
5-
CPP_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
6-
AR_i686-pc-windows-msvc="$(CFG_MSVC_LIB_i386)" -nologo
2+
CC_i686-pc-windows-msvc=$(CFG_MSVC_CL_i386)
3+
LINK_i686-pc-windows-msvc=$(CFG_MSVC_LINK_i386)
4+
CXX_i686-pc-windows-msvc=$(CFG_MSVC_CL_i386)
5+
CPP_i686-pc-windows-msvc=$(CFG_MSVC_CL_i386)
6+
AR_i686-pc-windows-msvc=$(CFG_MSVC_LIB_i386)
77
CFG_LIB_NAME_i686-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_i686-pc-windows-msvc=$(1).lib
99
CFG_LIB_GLOB_i686-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_i686-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_i686-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_i686-pc-windows-msvc := -MD
13-
CFG_GCCISH_CXXFLAGS_i686-pc-windows-msvc := -MD
12+
CFG_GCCISH_CFLAGS_i686-pc-windows-msvc := -MD -nologo
13+
CFG_GCCISH_CXXFLAGS_i686-pc-windows-msvc := -MD -nologo
1414
CFG_GCCISH_LINK_FLAGS_i686-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_i686-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_i686-pc-windows-msvc :=

‎tags/homu-tmp/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# x86_64-pc-windows-msvc configuration
2-
CC_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
3-
LINK_x86_64-pc-windows-msvc="$(CFG_MSVC_LINK_x86_64)" -nologo
4-
CXX_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
5-
CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
6-
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB_x86_64)" -nologo
2+
CC_x86_64-pc-windows-msvc=$(CFG_MSVC_CL_x86_64)
3+
LINK_x86_64-pc-windows-msvc=$(CFG_MSVC_LINK_x86_64)
4+
CXX_x86_64-pc-windows-msvc=$(CFG_MSVC_CL_x86_64)
5+
CPP_x86_64-pc-windows-msvc=$(CFG_MSVC_CL_x86_64)
6+
AR_x86_64-pc-windows-msvc=$(CFG_MSVC_LIB_x86_64)
77
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
99
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD
13-
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc := -MD
12+
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD -nologo
13+
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc := -MD -nologo
1414
CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_x86_64-pc-windows-msvc :=

‎tags/homu-tmp/mk/crates.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ DEPS_rustc_lint := rustc log syntax rustc_const_eval
111111
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
112112
DEPS_rustc_metadata := rustc syntax rbml rustc_const_math
113113
DEPS_rustc_passes := syntax rustc core rustc_const_eval
114-
DEPS_rustc_mir := rustc syntax rustc_const_math rustc_const_eval
114+
DEPS_rustc_mir := rustc syntax rustc_const_math rustc_const_eval rustc_bitflags
115115
DEPS_rustc_resolve := arena rustc log syntax
116116
DEPS_rustc_platform_intrinsics := std
117117
DEPS_rustc_plugin := rustc rustc_metadata syntax rustc_mir
@@ -120,7 +120,7 @@ DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir
120120
log syntax serialize rustc_llvm rustc_platform_intrinsics \
121121
rustc_const_math rustc_const_eval rustc_incremental
122122
DEPS_rustc_incremental := rbml rustc serialize rustc_data_structures
123-
DEPS_rustc_save_analysis := rustc log syntax
123+
DEPS_rustc_save_analysis := rustc log syntax serialize
124124
DEPS_rustc_typeck := rustc syntax rustc_platform_intrinsics rustc_const_math \
125125
rustc_const_eval
126126

‎tags/homu-tmp/mk/debuggers.mk

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,13 @@ DEBUGGER_BIN_SCRIPTS_LLDB_ABS=\
4141

4242

4343
## ALL ##
44-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB) \
45-
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB)
46-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
47-
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS)
44+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL=gdb_load_rust_pretty_printers.py \
45+
gdb_rust_pretty_printing.py \
46+
lldb_rust_formatters.py \
47+
debugger_pretty_printers_common.py
48+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS=\
49+
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL), \
50+
$(CFG_SRC_DIR)src/etc/$(script))
4851
DEBUGGER_BIN_SCRIPTS_ALL=$(DEBUGGER_BIN_SCRIPTS_GDB) \
4952
$(DEBUGGER_BIN_SCRIPTS_LLDB)
5053
DEBUGGER_BIN_SCRIPTS_ALL_ABS=$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) \

‎tags/homu-tmp/mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ endif
390390
# This 'function' will determine which debugger scripts to copy based on a
391391
# target triple. See debuggers.mk for more information.
392392
TRIPLE_TO_DEBUGGER_SCRIPT_SETTING=\
393-
$(if $(findstring windows,$(1)),none,$(if $(findstring darwin,$(1)),lldb,gdb))
393+
$(if $(findstring windows-msvc,$(1)),none,all)
394394

395395
STAGES = 0 1 2 3
396396

‎tags/homu-tmp/mk/platform.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ define CC_MACROS
148148
CFG_CC_INCLUDE_$(1)=-I $$(1)
149149
ifeq ($$(findstring msvc,$(1)),msvc)
150150
CFG_CC_OUTPUT_$(1)=-Fo:$$(1)
151-
CFG_CREATE_ARCHIVE_$(1)=$$(AR_$(1)) -OUT:$$(1)
151+
CFG_CREATE_ARCHIVE_$(1)='$$(AR_$(1))' -OUT:$$(1)
152152
else
153153
CFG_CC_OUTPUT_$(1)=-o $$(1)
154154
CFG_CREATE_ARCHIVE_$(1)=$$(AR_$(1)) crus $$(1)
@@ -187,7 +187,7 @@ define CFG_MAKE_TOOLCHAIN
187187
endif
188188
endif
189189

190-
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
190+
CFG_COMPILE_C_$(1) = '$$(CC_$(1))' \
191191
$$(CFLAGS) \
192192
$$(CFG_GCCISH_CFLAGS) \
193193
$$(CFG_GCCISH_CFLAGS_$(1)) \
@@ -198,7 +198,7 @@ define CFG_MAKE_TOOLCHAIN
198198
$$(CFG_GCCISH_LINK_FLAGS_$(1)) \
199199
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
200200
$$(call CFG_INSTALL_NAME_$(1),$$(4))
201-
CFG_COMPILE_CXX_$(1) = $$(CXX_$(1)) \
201+
CFG_COMPILE_CXX_$(1) = '$$(CXX_$(1))' \
202202
$$(CXXFLAGS) \
203203
$$(CFG_GCCISH_CFLAGS) \
204204
$$(CFG_GCCISH_CXXFLAGS) \

0 commit comments

Comments
 (0)