Skip to content

Commit

Permalink
rust / build: make install should use explicit permissions when creat…
Browse files Browse the repository at this point in the history 
…ing directories

Closes #10046
  • Loading branch information
@ibukanov
ibukanov committed Oct 24, 2013
1 parent f27dfa0 commit 47fff53
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions mk/install.mk
View file
Expand Up @@ -23,6 +23,10 @@ else
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
endif

# For MK_INSTALL_DIR
# $(1) is the directory to create
MK_INSTALL_DIR = (umask 022 && mkdir -p $(1))

# For INSTALL_LIB,
# Target-specific $(LIB_SOURCE_DIR) is the source directory
# Target-specific $(LIB_DESTIN_DIR) is the destination directory
Expand Down Expand Up @@ -83,7 +87,7 @@ define INSTALL_TARGET_N
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
$$(Q)mkdir -p $$(PTL$(1)$(2))
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
Expand All @@ -95,7 +99,7 @@ define INSTALL_HOST_N
install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
$$(Q)mkdir -p $$(PTL$(1)$(2))
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
Expand Down Expand Up @@ -131,9 +135,9 @@ PHL = $(PREFIX_LIB)
install-host: LIB_SOURCE_DIR=$(HL)
install-host: LIB_DESTIN_DIR=$(PHL)
install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
$(Q)mkdir -p $(PREFIX_BIN)
$(Q)mkdir -p $(PREFIX_LIB)
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_BIN))
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_LIB))
$(Q)$(call MK_INSTALL_DIR,$(PREFIX_ROOT)/share/man/man1)
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
Expand Down

13 comments on commit 47fff53

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at ibukanov@47fff53

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ibukanov/rust/mkdir-fix = 47fff53 into auto

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ibukanov/rust/mkdir-fix = 47fff53 merged ok, testing candidate = 590db83d

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at ibukanov@47fff53

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ibukanov/rust/mkdir-fix = 47fff53 into auto

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ibukanov/rust/mkdir-fix = 47fff53 merged ok, testing candidate = c7b20b67

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1275
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2165
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/11
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/11
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2169
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1275
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1274
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2183
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1275
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1275
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2184
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1275
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1275
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2168
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1273
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1949

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at ibukanov@47fff53

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ibukanov/rust/mkdir-fix = 47fff53 into auto

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ibukanov/rust/mkdir-fix = 47fff53 merged ok, testing candidate = f1b8772

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/2167
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/13
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/13
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2171
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1277
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1276
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2185
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1277
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1277
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2186
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1277
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1277
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/1355
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2170
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1275
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1277
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1951

@bors
Copy link
Contributor

@bors bors commented on 47fff53 Oct 26, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = f1b8772

Please sign in to comment.