Explorar o código

cygwin support refresh

U-windows7\wbx %!s(int64=14) %!d(string=hai) anos
pai
achega
c58c1d4555
Modificáronse 4 ficheiros con 14 adicións e 6 borrados
  1. 5 1
      Config.in
  2. 3 2
      Makefile
  3. 3 0
      mk/build.mk
  4. 3 3
      scripts/scan-tools.sh

+ 5 - 1
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

+ 3 - 2
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 ;\

+ 3 - 0
mk/build.mk

@@ -239,6 +239,9 @@ ifeq (${OStype},OpenBSD)
 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 \

+ 3 - 3
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