vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add nproc fix for macOS

Browse source
This commit is contained in:
Jeremy Soller 2017-02-01 14:15:48 -07:00
parent 756e58b9e7
commit 1097edcab7
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
mk/config.mk
View file

@ -1,6 +1,28 @@
# Configuration # Configuration
ARCH?=x86_64 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 # Automatic variables
ROOT=$(PWD) ROOT=$(PWD)
export RUST_TARGET_PATH=$(ROOT)/kernel/targets export RUST_TARGET_PATH=$(ROOT)/kernel/targets
@ -21,24 +43,4 @@ BUILD=build/userspace
RUSTC=./rustc.sh RUSTC=./rustc.sh
RUSTDOC=./rustdoc.sh RUSTDOC=./rustdoc.sh
CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
CARGOFLAGS=--target $(TARGET) --release -- -C codegen-units=`nproc` 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

2
programs/coreutils

@ -1 +1 @@
Subproject commit 330e6a7ec26640173107d4948c6cc77e457a431f Subproject commit e589e0963036dcd782af438be38aca14f8691370