summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-14 15:53:47 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-14 15:53:47 +0000
commitd1b7d3770d326b1d494792b9ad94b071d9970bc2 (patch)
tree2a66145ac5fe2790ffa7d17ee51f3c31360bf0fe
parentaec70ecef0bb7a8fce661de6a991b7f0864e140e (diff)
set the umask in toplevel.mk instead of forcing the user to adjust it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23445 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/prereq-build.mk7
-rw-r--r--include/toplevel.mk2
2 files changed, 2 insertions, 7 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index afb92ff02..84d3f2274 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -18,13 +18,6 @@ $(eval $(call Require,non-root, \
Please do not compile as root. \
))
-define Require/umask-0022
- [ "$$(shell umask)" -eq 22 ]
-endef
-$(eval $(call Require,umask-0022, \
- Please compile with umask 0022. \
-))
-
# Required for the toolchain
define Require/working-make
$(MAKE) -v | awk '($$$$1 == "GNU") && ($$$$2 = "Make") && ($$$$3 >= "3.81") { print "ok" }' | grep ok > /dev/null
diff --git a/include/toplevel.mk b/include/toplevel.mk
index dee43cba9..cb50dfa3d 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -41,6 +41,8 @@ endif
SCAN_COOKIE?=$(shell echo $$$$)
export SCAN_COOKIE
+SUBMAKE:=umask 022; $(SUBMAKE)
+
prepare-mk: FORCE ;
prepare-tmpinfo: FORCE