From 1097edcab782363c934aad61a2a630d01260888a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 1 Feb 2017 14:15:48 -0700 Subject: [PATCH] Add nproc fix for macOS --- mk/config.mk | 44 +++++++++++++++++++++++--------------------- programs/coreutils | 2 +- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/mk/config.mk b/mk/config.mk index b8e049a..19dfe52 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -1,6 +1,28 @@ # Configuration ARCH?=x86_64 +# Per host variables +UNAME := $(shell uname) +ifeq ($(UNAME),Darwin) + ECHO=/bin/echo + FUMOUNT=sudo umount + export LD=$(ARCH)-elf-ld + export LDFLAGS=--gc-sections + export NPROC=sysctl -n hw.ncpu + export STRIP=$(ARCH)-elf-strip + VB_AUDIO=coreaudio + VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage" +else + ECHO=echo + FUMOUNT=fusermount -u + export LD=ld + export LDFLAGS=--gc-sections + export NPROC=nproc + export STRIP=strip + VB_AUDIO="pulse" + VBM=VBoxManage +endif + # Automatic variables ROOT=$(PWD) export RUST_TARGET_PATH=$(ROOT)/kernel/targets @@ -21,24 +43,4 @@ BUILD=build/userspace RUSTC=./rustc.sh RUSTDOC=./rustdoc.sh CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo -CARGOFLAGS=--target $(TARGET) --release -- -C codegen-units=`nproc` - -# Per host variables -UNAME := $(shell uname) -ifeq ($(UNAME),Darwin) - ECHO=/bin/echo - FUMOUNT=sudo umount - export LD=$(ARCH)-elf-ld - export LDFLAGS=--gc-sections - export STRIP=$(ARCH)-elf-strip - VB_AUDIO=coreaudio - VBM="/Applications/VirtualBox.app/Contents/MacOS/VBoxManage" -else - ECHO=echo - FUMOUNT=fusermount -u - export LD=ld - export LDFLAGS=--gc-sections - export STRIP=strip - VB_AUDIO="pulse" - VBM=VBoxManage -endif +CARGOFLAGS=--target $(TARGET) --release -- -C codegen-units=`$(NPROC)` diff --git a/programs/coreutils b/programs/coreutils index 330e6a7..e589e09 160000 --- a/programs/coreutils +++ b/programs/coreutils @@ -1 +1 @@ -Subproject commit 330e6a7ec26640173107d4948c6cc77e457a431f +Subproject commit e589e0963036dcd782af438be38aca14f8691370