Kaydet (Commit) 4c41530e authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Use the build.pl parallelism again.

üst 7c292efd
...@@ -7,7 +7,6 @@ SHELL=/usr/bin/env bash ...@@ -7,7 +7,6 @@ SHELL=/usr/bin/env bash
define forward_to_gbuild define forward_to_gbuild
@GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \ @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \
$(if @VERBOSE@,,-s) \ $(if @VERBOSE@,,-s) \
--jobs="@GMAKE_PARALLELISM@" \
$(1) $(1)
endef endef
......
...@@ -1771,6 +1771,7 @@ else ...@@ -1771,6 +1771,7 @@ else
ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB, "e" ); ToFile( "SOLARLIB_FOR_BUILD", $SOLARLIB, "e" );
ToFile( "WORKDIR_FOR_BUILD", $WORKDIR, "e" ); ToFile( "WORKDIR_FOR_BUILD", $WORKDIR, "e" );
} }
ToFile( "BUILD_NCPUS", "@BUILD_NCPUS@", "e" );
ToFile( "GMAKE_PARALLELISM", "@GMAKE_PARALLELISM@", "e" ); ToFile( "GMAKE_PARALLELISM", "@GMAKE_PARALLELISM@", "e" );
ToFile( "GMAKE_MODULE_PARALLELISM","@GMAKE_MODULE_PARALLELISM@", "e" ); ToFile( "GMAKE_MODULE_PARALLELISM","@GMAKE_MODULE_PARALLELISM@", "e" );
ToFile( "SIZEOF_SHORT", "@SIZEOF_SHORT@", "e" ); ToFile( "SIZEOF_SHORT", "@SIZEOF_SHORT@", "e" );
......
...@@ -50,7 +50,7 @@ gb_MAKETARGET=all ...@@ -50,7 +50,7 @@ gb_MAKETARGET=all
endif endif
define gb_BuildplTarget_command define gb_BuildplTarget_command
cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl --all gb_MAKETARGET=$(gb_MAKETARGET) cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
endef endef
.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment