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/gcc | |
| parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
| parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain/gcc')
| -rw-r--r-- | toolchain/gcc/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 5d4dc706b..9ad2a3b05 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 @@ -38,6 +38,10 @@ else GCC_CONFOPTS+= --enable-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 @@ -59,7 +63,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 @@ -88,7 +92,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 @@ -111,7 +115,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 @@ -126,7 +130,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 $@ |