Skip to content

Commit 9f4323f

Browse files
committed
---
yaml --- r: 93288 b: refs/heads/try c: 357ef1f h: refs/heads/master v: v3
1 parent baf749b commit 9f4323f

File tree

210 files changed

+3306
-3203
lines changed

Some content is hidden

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

210 files changed

+3306
-3203
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: 672edb21d9d422486230fe7dcba60100bc077c4c
5+
refs/heads/try: 357ef1f69cd1ffbd3c36a9e7e171b10263d94139
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/mk/install.mk

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ else
2323
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
2424
endif
2525

26-
# For MK_INSTALL_DIR
27-
# $(1) is the directory to create
28-
MK_INSTALL_DIR = (umask 022 && mkdir -p $(1))
29-
3026
# For INSTALL_LIB,
3127
# Target-specific $(LIB_SOURCE_DIR) is the source directory
3228
# Target-specific $(LIB_DESTIN_DIR) is the destination directory
@@ -87,7 +83,7 @@ define INSTALL_TARGET_N
8783
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
8884
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
8985
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
90-
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
86+
$$(Q)mkdir -p $$(PTL$(1)$(2))
9187
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
9288
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
9389
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
@@ -99,7 +95,7 @@ define INSTALL_HOST_N
9995
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
10096
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
10197
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
102-
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
98+
$$(Q)mkdir -p $$(PTL$(1)$(2))
10399
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
104100
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
105101
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
@@ -135,9 +131,9 @@ PHL = $(PREFIX_LIB)
135131
install-host: LIB_SOURCE_DIR=$(HL)
136132
install-host: LIB_DESTIN_DIR=$(PHL)
137133
install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
138-
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_BIN))
139-
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_LIB))
140-
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_ROOT)/share/man/man1)
134+
$(Q)mkdir -p $(PREFIX_BIN)
135+
$(Q)mkdir -p $(PREFIX_LIB)
136+
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
141137
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD_TRIPLE)))
142138
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
143139
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))

branches/try/mk/rt.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
8989
rt/rust_upcall.cpp \
9090
rt/rust_uv.cpp \
9191
rt/miniz.cpp \
92-
rt/memory_region.cpp \
93-
rt/boxed_region.cpp \
9492
rt/rust_android_dummy.cpp \
9593
rt/rust_test_helpers.cpp
9694

branches/try/src/etc/licenseck.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@
7676
"rt/isaac/randport.cpp", # public domain
7777
"rt/isaac/rand.h", # public domain
7878
"rt/isaac/standard.h", # public domain
79-
"libstd/rt/mpsc_queue.rs", # BSD
80-
"libstd/rt/mpmc_bounded_queue.rs", # BSD
8179
]
8280

8381
def check_license(name, contents):

0 commit comments

Comments
 (0)