diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /toolchain | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/uClibc/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 8d956f4b1..ee64a4940 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -8,6 +8,10 @@ include ../rules.mk include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk +ifeq (${ADK_MAKE_PARALLEL},y) +UCLIBC_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ @@ -15,7 +19,7 @@ $(WRKBUILD)/.headers: ifneq ($(ADK_DEBUG),) $(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config endif - $(MAKE) -C $(WRKBUILD) \ + $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX=$(TOOLCHAIN_SYSROOT) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT) \ @@ -26,7 +30,7 @@ endif touch $@ $(WRKBUILD)/.compiled: - $(MAKE) -C $(WRKBUILD) \ + $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX= \ DEVEL_PREFIX=/ \ RUNTIME_PREFIX=/ \ |