Skip to content

Commit 47fff53

Browse files
committed
rust / build: make install should use explicit permissions when creating directories
Closes #10046
1 parent f27dfa0 commit 47fff53

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

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)))

0 commit comments

Comments
 (0)