diff options
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | TODO | 1 | ||||
-rw-r--r-- | mk/build.mk | 1 | ||||
-rw-r--r-- | rules.mk | 2 | ||||
-rwxr-xr-x | scripts/awk | 9 |
5 files changed, 13 insertions, 4 deletions
@@ -1,7 +1,7 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -_UNLIMIT= ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null; +_UNLIMIT= ulimit -dS $(shell ulimit -dH >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null; all: .prereq_done @${_UNLIMIT} ${GMAKE_INV} all @@ -187,7 +187,7 @@ NO_ERROR=0 -e 's/i[3-9]86/i386/' \ )" >>prereq.mk @echo 'HOSTCC:=${CC}' >>prereq.mk - @echo 'HOSTCFLAGS:=-O2 -fwrapv' >>prereq.mk + @echo 'HOSTCFLAGS:=-O2' >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk @@ -1,6 +1,5 @@ - netbsd build - macos x build -- openbsd build - make rpm package backend working - network scripts for wireless client / ap - network scripts for pppoe diff --git a/mk/build.mk b/mk/build.mk index e8309afba..1a9c637cf 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,6 +13,7 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ + ADK_MAKE_PARALLEL=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ @@ -40,7 +40,7 @@ export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH HOSTCPPFLAGS?= HOSTLDFLAGS?= -TARGET_CFLAGS:= $(strip -fwrapv -fno-ident ${TARGET_CFLAGS}) +TARGET_CFLAGS:= $(strip -fno-ident ${TARGET_CFLAGS}) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) diff --git a/scripts/awk b/scripts/awk new file mode 100755 index 000000000..ff6f9b002 --- /dev/null +++ b/scripts/awk @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +if [ -z "$(which gawk 2>/dev/null)" ];then + /bin/awk "$@" +else + gawk "$@" +fi |