diff --git a/Makefile.in b/Makefile.in index 454208642..b429603ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ QEMU = @QEMU@ -machine accel=kvm -cpu host CROSSDIR = @CROSSDIR@ -JOBS = 20 +JOBS = $(shell nproc) default: linux/arch/x86/boot/bzImage make PATH=$(PATH):$(CROSSDIR) -C hermit diff --git a/hermit/usr/Makefile b/hermit/usr/Makefile index 7c0c70c2d..207c444a0 100644 --- a/hermit/usr/Makefile +++ b/hermit/usr/Makefile @@ -1,7 +1,7 @@ override TOPDIR = $(shell pwd) ARCH = x86 TARGET=x86_64-hermit -NJOBS=-j20 +NJOBS=-j$(shell nproc) #OMPRT=libgomp OMPRT=libomp @@ -41,20 +41,20 @@ bootstrap: $(ARCH) $(TMP)/binutils $(TMP)/bootstrap $(TMP)/binutils: @echo Build binutils $Q$(MKDIR) $(TMP)/binutils - $Q$(CD) $(TMP)/binutils; $(TOPDIR)/binutils/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --disable-shared --disable-nls --disable-gdb --disable-libdecnumber --disable-readline --disable-sim --disable-libssp --enable-tls && $(MAKE) $(NJOBS) && $(MAKE) install + $Q$(CD) $(TMP)/binutils; $(TOPDIR)/binutils/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --disable-shared --disable-nls --disable-gdb --disable-libdecnumber --disable-readline --disable-sim --disable-libssp --enable-tls && $(MAKE) -s $(NJOBS) && $(MAKE) install $(TMP)/bootstrap: @echo Build bootstrap compiler $Q$(MKDIR) $(TMP)/bootstrap - $Q$(CD) $(TMP)/bootstrap; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-isl --with-tune=generic --enable-languages=c --disable-nls --disable-shared --disable-libssp --disable-libgomp --enable-threads=posix --enable-tls && $(MAKE) $(NJOBS) all-gcc && $(MAKE) install-gcc + $Q$(CD) $(TMP)/bootstrap; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-isl --with-tune=generic --enable-languages=c --disable-nls --disable-shared --disable-libssp --disable-libgomp --enable-threads=posix --enable-tls && $(MAKE) -s $(NJOBS) all-gcc && $(MAKE) install-gcc toolchain: $(TMP)/newlib pte $(TMP)/gcc libs headers demo $(TMP)/newlib: @echo Build newlib, libpthread and libgomp $Q$(MKDIR) $(TMP)/newlib - $Q$(CD) $(TMP)/newlib; $(TOPDIR)/newlib/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) $(OPT) && $(MAKE) $(NJOBS) && $(MAKE) install + $Q$(CD) $(TMP)/newlib; $(TOPDIR)/newlib/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) $(OPT) && $(MAKE) -s $(NJOBS) && $(MAKE) install pte: $Q$(MAKE) TARGET=$(TARGET) CC_FOR_TARGET=$(CC_FOR_TARGET) AR_FOR_TARGET=$(AR_FOR_TARGET) CFLAGS_FOR_TARGET+="-I. -Iplatform/hermit -Iplatform/helper -Wall" -C pte depend @@ -78,10 +78,10 @@ headers: $(TMP)/gcc: @echo Build final gcc $Q$(MKDIR) $(TMP)/gcc - $Q$(CD) $(TMP)/gcc; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-newlib --with-isl --with-tune=generic --enable-languages=c --disable-nls --disable-shared --disable-libssp --enable-threads=posix --disable-libgomp --enable-tls --enable-lto --disable-symvers && $(MAKE) $(NJOBS) && $(MAKE) install + $Q$(CD) $(TMP)/gcc; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-newlib --with-isl --with-tune=generic --enable-languages=c --disable-nls --disable-shared --disable-libssp --enable-threads=posix --disable-libgomp --enable-tls --enable-lto --disable-symvers && $(MAKE) -s $(NJOBS) && $(MAKE) install $Q$(RM) $(TMP)/gcc $Q$(MKDIR) $(TMP)/gcc - $Q$(CD) $(TMP)/gcc; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-newlib --with-isl --with-tune=generic --enable-languages=c,c++,fortran,lto --disable-nls --disable-shared --disable-libssp --enable-threads=posix --disable-libgomp --enable-tls --enable-lto --disable-symvers && $(MAKE) $(NJOBS) && $(MAKE) install + $Q$(CD) $(TMP)/gcc; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-newlib --with-isl --with-tune=generic --enable-languages=c,c++,fortran,lto --disable-nls --disable-shared --disable-libssp --enable-threads=posix --disable-libgomp --enable-tls --enable-lto --disable-symvers && $(MAKE) -s $(NJOBS) && $(MAKE) install clean: @echo Cleaning toolchain