diff options
| author | bors <bors@rust-lang.org> | 2016-10-08 02:23:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-08 02:23:47 -0700 |
| commit | b5fcca5cd76f9e4bcf2a31f7b3a9a7a0deb6fe3b (patch) | |
| tree | c2b5cbdeaf532b454c6921f42796db9edfa4160a | |
| parent | 195dbfa0980715ce6eb4b8baa1aa22bea15be69a (diff) | |
| parent | f171d98804b83850e253e0521025ee6468b3f9df (diff) | |
| download | rust-b5fcca5cd76f9e4bcf2a31f7b3a9a7a0deb6fe3b.tar.gz rust-b5fcca5cd76f9e4bcf2a31f7b3a9a7a0deb6fe3b.zip | |
Auto merge of #37015 - ahmedcharles:sudo, r=alexcrichton
Prevent accidentally running 'make install' as sudo. r? @alexcrichton I missed this in the previous PR, but this seems to work. It should probably go in a rollup, but I don't know how to do those. :/
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 61d0e254074..0762ed98472 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -52,7 +52,11 @@ check-cargotest: dist: $(Q)$(BOOTSTRAP) --step dist install: +ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER))) + $(Q)echo "'sudo make install' is not supported currently." +else $(Q)$(BOOTSTRAP) --step install +endif tidy: $(Q)$(BOOTSTRAP) --step check-tidy --stage 0 |