Skip to content

Commit 33a019d

Browse files
committed
---
yaml --- r: 146237 b: refs/heads/try2 c: de3d36a h: refs/heads/master i: 146235: dae26b1 v: v3
1 parent e4988af commit 33a019d

File tree

194 files changed

+2398
-3048
lines changed

Some content is hidden

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

194 files changed

+2398
-3048
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 7a1d97e62cd467596457d850fd5e73f6160159c2
8+
refs/heads/try2: de3d36a763a09032a68aa9d47071840c8b4dd5a7
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
branch = master
99
[submodule "src/gyp"]
1010
path = src/gyp
11-
url = https://git.chromium.org/external/gyp.git
11+
url = https://github.com/brson/gyp.git

branches/try2/mk/install.mk

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ 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+
2630
# For INSTALL_LIB,
2731
# Target-specific $(LIB_SOURCE_DIR) is the source directory
2832
# Target-specific $(LIB_DESTIN_DIR) is the destination directory
@@ -83,7 +87,7 @@ define INSTALL_TARGET_N
8387
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
8488
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
8589
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
86-
$$(Q)mkdir -p $$(PTL$(1)$(2))
90+
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
8791
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
8892
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
8993
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
@@ -95,7 +99,7 @@ define INSTALL_HOST_N
9599
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
96100
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
97101
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
98-
$$(Q)mkdir -p $$(PTL$(1)$(2))
102+
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
99103
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
100104
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
101105
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
@@ -131,9 +135,9 @@ PHL = $(PREFIX_LIB)
131135
install-host: LIB_SOURCE_DIR=$(HL)
132136
install-host: LIB_DESTIN_DIR=$(PHL)
133137
install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
134-
$(Q)mkdir -p $(PREFIX_BIN)
135-
$(Q)mkdir -p $(PREFIX_LIB)
136-
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
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)
137141
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD_TRIPLE)))
138142
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
139143
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))

branches/try2/src/etc/licenseck.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
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
7981
]
8082

8183
def check_license(name, contents):

0 commit comments

Comments
 (0)