summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in6
-rw-r--r--Makefile5
-rw-r--r--mk/build.mk3
-rw-r--r--scripts/scan-tools.sh6
4 files changed, 14 insertions, 6 deletions
diff --git a/Config.in b/Config.in
index 8970fc779..298cb2a10 100644
--- a/Config.in
+++ b/Config.in
@@ -110,7 +110,11 @@ config ADK_HOST_OPENBSD
boolean
config ADK_HOST_NETBSD
- prompt "OpenBSD"
+ prompt "NetBSD"
+ boolean
+
+config ADK_HOST_CYGWIN
+ prompt "Cygwin"
boolean
endchoice
diff --git a/Makefile b/Makefile
index 6a5609fd2..e5d0280dd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ CC?= gcc
GMAKE?= $(PWD)/scripts/make
GMAKE_FMK= ${GMAKE} -f $(PWD)/mk/build.mk
GMAKE_INV= ${GMAKE_FMK} --no-print-directory
-_UNLIMIT= ulimit -dS $$(ulimit -dH);
+
+_UNLIMIT= ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null;
all: .prereq_done
@${_UNLIMIT} ${GMAKE_INV} all
@@ -160,7 +161,7 @@ NO_ERROR=0
fi
@echo "TOPDIR:=$$(readlink -nf . 2>/dev/null || pwd -P)" >prereq.mk
@echo "BASH:=$$(which bash)" >>prereq.mk
- @if [ -z "$$(which gmake)" ]; then \
+ @if [ -z "$$(which gmake 2>/dev/null )" ]; then \
echo "GMAKE:=$$(which make)" >>prereq.mk ;\
else \
echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\
diff --git a/mk/build.mk b/mk/build.mk
index 9f35a3827..b1a2c814f 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -240,6 +240,9 @@ endif
ifeq (${OStype},NetBSD)
@echo ADK_HOST_NETBSD=y > $(TOPDIR)/.defconfig
endif
+ifneq (,$(filter CYGWIN%,${OStype}))
+ @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
+endif
@if [ ! -z "$(TARGET)" ];then \
grep "^config" target/Config.in \
|grep -i "$(TARGET)" \
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index ef6d7babb..70547394e 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -5,10 +5,10 @@ shopt -s extglob
topdir=$(pwd)
opath=$PATH
out=0
-if [ -z $(which gmake) ];then
- makecmd=$(which make)
+if [ -z $(which gmake 2>/dev/null ) ];then
+ makecmd=$(which make 2>/dev/null )
else
- makecmd=$(which gmake)
+ makecmd=$(which gmake 2>/dev/null )
fi
if [[ $NO_ERROR != @(0|1) ]]; then