From b96814ed6f6bbc7ec650c513f2b27f8b1dcb8ac7 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 24 Feb 2010 01:05:45 +0100 Subject: toolchain: enable parallel building for gcc, glibc, binutils, gmp and mpfr --- toolchain/binutils/Makefile | 6 +++++- toolchain/gcc/Makefile | 10 +++++++--- toolchain/gdb/Makefile | 6 +++++- toolchain/glibc/Makefile | 8 ++++++-- toolchain/gmp/Makefile | 6 +++++- toolchain/mpfr/Makefile | 6 +++++- 6 files changed, 33 insertions(+), 9 deletions(-) (limited to 'toolchain') diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index fb6beccab..c3dc45b07 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -10,6 +10,10 @@ ifeq ($(ADK_LINUX_64),y) CONFOPTS+= --enable-64-bit-bfd endif +ifeq (${ADK_MAKE_PARALLEL},y) +BINUTILS_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ @@ -31,7 +35,7 @@ $(WRKBUILD)/.configured: touch $@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured - $(MAKE) -C $(WRKBUILD) all + $(MAKE) ${BINUTILS_MAKEOPTS} -C $(WRKBUILD) all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 0fc5edc1d..1cf762810 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -36,6 +36,10 @@ ifeq ($(ADK_TARGET_LIB_UCLIBC),y) GCC_CONFOPTS+= --disable-tls endif +ifeq (${ADK_MAKE_PARALLEL},y) +GCC_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + include ${TOPDIR}/mk/buildhlp.mk GCC_BUILD_DIR_MINIMAL:= $(WRKBUILD)-minimal @@ -57,7 +61,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured: $(GCC_BUILD_DIR_MINIMAL)/.compiled: $(GCC_BUILD_DIR_MINIMAL)/.configured PATH=$(TARGET_PATH) \ - $(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) all-gcc + $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_MINIMAL) all-gcc touch $@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled @@ -86,7 +90,7 @@ $(GCC_BUILD_DIR_INITIAL)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured PATH=$(TARGET_PATH) \ - $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc + $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc touch $@ $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled @@ -109,7 +113,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured: $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured PATH=$(TARGET_PATH) \ - $(MAKE) -C $(GCC_BUILD_DIR_FINAL) all + $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_FINAL) all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index 0d6b7cb48..9571f2a9f 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -7,6 +7,10 @@ include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk +ifeq (${ADK_MAKE_PARALLEL},y) +GDB_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ @@ -33,7 +37,7 @@ $(WRKBUILD)/.configured: touch $@ $(WRKBUILD)/.compiled: - $(MAKE) -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}" + $(MAKE) ${GDB_MAKEOPTS} -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}" touch $@ $(WRKBUILD)/.installed: diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 2058c41d4..a45fe6fb6 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -43,6 +43,10 @@ ifeq ($(ADK_TARGET_NO_FPU),y) GLIBC_CONFOPTS+= --without-fp endif +ifeq (${ADK_MAKE_PARALLEL},y) +GLIBC_MAKEOPTS+= PARALLELMFLAGS="-j${ADK_MAKE_JOBS}" +endif + GLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers GLIBC_BUILD_DIR_FINAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final @@ -58,7 +62,7 @@ $(WRKBUILD)/.headers_configure: $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib - $(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \ + $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \ cross-compiling=yes \ install_root=$(TOOLCHAIN_SYSROOT) \ install-headers @@ -78,7 +82,7 @@ $(WRKBUILD)/.configured: touch $@ $(WRKBUILD)/.compiled: - ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) all + ${GLIBC_ENV} $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_FINAL) all touch $@ $(WRKBUILD)/.installed: diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index bbe26f14d..c31e76483 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -6,6 +6,10 @@ include ../rules.mk include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk +ifeq (${ADK_MAKE_PARALLEL},y) +GMP_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ @@ -20,7 +24,7 @@ $(WRKBUILD)/.configured: touch $@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured - $(MAKE) -C $(WRKBUILD) all + $(MAKE) ${GMP_MAKEOPTS} -C $(WRKBUILD) all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile index f74f0199f..d16729a70 100644 --- a/toolchain/mpfr/Makefile +++ b/toolchain/mpfr/Makefile @@ -7,6 +7,10 @@ include $(TOPDIR)/toolchain/gmp/Makefile.inc include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk +ifeq (${ADK_MAKE_PARALLEL},y) +MPFR_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ @@ -21,7 +25,7 @@ $(WRKBUILD)/.configured: touch $@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured - $(MAKE) -C $(WRKBUILD) all + $(MAKE) ${MPFR_MAKEOPTS} -C $(WRKBUILD) all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled -- cgit v1.2.3 From 65e5e3f6209a4d72be094393ff2d7df871e36184 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 24 Feb 2010 01:05:46 +0100 Subject: toolchain: trailing whitespaces cleanup (just cosmetics!) --- toolchain/Makefile | 4 ++-- toolchain/binutils/Makefile | 4 ++-- toolchain/eglibc/Makefile | 4 ++-- toolchain/gcc/Makefile | 4 ++-- toolchain/gdb/Makefile | 4 ++-- toolchain/glibc/Makefile | 2 +- toolchain/gmp/Makefile | 4 ++-- toolchain/mpfr/Makefile | 4 ++-- toolchain/uClibc/Makefile | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'toolchain') diff --git a/toolchain/Makefile b/toolchain/Makefile index 2c424ed7d..a66791df0 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -7,7 +7,7 @@ # 3) build and install gcc c compiler # 4) install kernel-headers # 5) install libc headers -# 6) build and install full gcc +# 6) build and install full gcc # 7) build and install full libc # 8) build and install gdb debugger @@ -38,7 +38,7 @@ clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) gcc-prepare: binutils-install gmp-install mpfr-install -$(LIBC)-prepare: gcc-prepare kernel-headers-prepare +$(LIBC)-prepare: gcc-prepare kernel-headers-prepare gcc-configure: $(LIBC)-prepare $(LIBC)-compile: gcc-configure gcc-compile: $(LIBC)-install diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index c3dc45b07..53ddb5dde 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -14,8 +14,8 @@ ifeq (${ADK_MAKE_PARALLEL},y) BINUTILS_MAKEOPTS+= -j${ADK_MAKE_JOBS} endif -$(WRKBUILD)/.headers: -$(WRKBUILD)/.configured: +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 1605113c6..f52cf0717 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -31,7 +31,7 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_forced_unwind=yes \ libc_cv_c_cleanup=yes \ libc_cv_gnu99_inline=yes \ - libc_cv_slibdir="/lib" + libc_cv_slibdir="/lib" ifeq ($(ADK_TARGET_NO_FPU),y) EGLIBC_CONFOPTS+= --without-fp @@ -62,7 +62,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure install-headers install-bootstrap-headers=yes touch $@ -$(WRKBUILD)/.configured: +$(WRKBUILD)/.configured: mkdir -p $(EGLIBC_BUILD_DIR_FINAL) $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ $(EGLIBC_BUILD_DIR_FINAL) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 1cf762810..0b033cd91 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -22,7 +22,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --disable-sjlj-exceptions \ --disable-libssp \ --disable-libstdcxx-pch \ - --disable-nls + --disable-nls ifeq ($(ADK_TARGET_NO_FPU),y) GCC_CONFOPTS+= --with-float=soft @@ -128,7 +128,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled cd bin; \ for app in $(REAL_GNU_TARGET_NAME)-* ; do \ ln -sf $${app} \ - $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ + $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ ) touch $@ diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index 9571f2a9f..52a40fb0d 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -36,11 +36,11 @@ $(WRKBUILD)/.configured: ); touch $@ -$(WRKBUILD)/.compiled: +$(WRKBUILD)/.compiled: $(MAKE) ${GDB_MAKEOPTS} -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}" touch $@ -$(WRKBUILD)/.installed: +$(WRKBUILD)/.installed: install -c $(WRKBUILD)/gdb/gdb $(TARGET_CROSS)gdb cd $(STAGING_TOOLS)/bin && \ ln -fs $(TARGET_CROSS)gdb $(GNU_TARGET_NAME)-gdb diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index a45fe6fb6..51059709e 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -69,7 +69,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h touch $@ -$(WRKBUILD)/.configured: +$(WRKBUILD)/.configured: mkdir -p $(GLIBC_BUILD_DIR_FINAL) (cd $(GLIBC_BUILD_DIR_FINAL); \ ${GLIBC_ENV} \ diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index c31e76483..1a6a77d26 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -10,8 +10,8 @@ ifeq (${ADK_MAKE_PARALLEL},y) GMP_MAKEOPTS+= -j${ADK_MAKE_JOBS} endif -$(WRKBUILD)/.headers: -$(WRKBUILD)/.configured: +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile index d16729a70..67753db9b 100644 --- a/toolchain/mpfr/Makefile +++ b/toolchain/mpfr/Makefile @@ -11,8 +11,8 @@ ifeq (${ADK_MAKE_PARALLEL},y) MPFR_MAKEOPTS+= -j${ADK_MAKE_JOBS} endif -$(WRKBUILD)/.headers: -$(WRKBUILD)/.configured: +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 8ccc2ac98..8d956f4b1 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -25,7 +25,7 @@ endif touch $(WRKBUILD)/.configured touch $@ -$(WRKBUILD)/.compiled: +$(WRKBUILD)/.compiled: $(MAKE) -C $(WRKBUILD) \ PREFIX= \ DEVEL_PREFIX=/ \ -- cgit v1.2.3