diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
| commit | 29486d09fc74ca557f97136ac852767e48a981f2 (patch) | |
| tree | 7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /toolchain/mpfr/Makefile | |
| parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
| parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain/mpfr/Makefile')
| -rw-r--r-- | toolchain/mpfr/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile index f74f0199f..67753db9b 100644 --- a/toolchain/mpfr/Makefile +++ b/toolchain/mpfr/Makefile @@ -7,8 +7,12 @@ include $(TOPDIR)/toolchain/gmp/Makefile.inc include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk -$(WRKBUILD)/.headers: -$(WRKBUILD)/.configured: +ifeq (${ADK_MAKE_PARALLEL},y) +MPFR_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ @@ -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 |