summaryrefslogtreecommitdiff
path: root/toolchain/glibc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-25 20:18:11 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-25 20:18:11 +0100
commit29486d09fc74ca557f97136ac852767e48a981f2 (patch)
tree7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /toolchain/glibc
parente473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff)
parent92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff)
resolve merge conflict
Diffstat (limited to 'toolchain/glibc')
-rw-r--r--toolchain/glibc/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 7e472831c..a0e4ce11e 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
@@ -59,14 +63,14 @@ $(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
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} \
@@ -79,7 +83,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: