diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2018-08-16 21:49:48 +0200 |
---|---|---|
committer | Gogs <gogs@fake.local> | 2018-08-16 21:49:48 +0200 |
commit | 71bd053dc6b5677d8de0fab9d2f7e512a09e7ad6 (patch) | |
tree | 83c060bb6e269ee4267c7e59dac4242faf8bfa69 /mk | |
parent | 56d412cecdfb4c0be541db9ef4153f7616608d28 (diff) | |
parent | dee2a0e2483bfda415c64f8e168763c63e71f7f6 (diff) |
Merge branch 'gogs-master' of ableton-dir/openadk into master
Diffstat (limited to 'mk')
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/host-bottom.mk | 2 | ||||
-rw-r--r-- | mk/pkg-bottom.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index ed40042d1..5c0dbf761 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -674,4 +674,6 @@ info: @printf "TOOLCHAIN_DIR=$(TOOLCHAIN_DIR)\n" @printf "TARGET_PATH=$(TARGET_PATH)\n" @printf "LINUX_DIR=$(LINUX_DIR)\n" + @printf "TARGET_DIR=$(TARGET_DIR)\n" @printf -- "---OPENADK-INFO---\n" + diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index a8f6db773..29cfc57ea 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -78,7 +78,7 @@ host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} @$(CMD_TRACE) "compiling.. " ifneq (${HOST_STYLE},manual) - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) endif ${MAKE} host-build $(MAKE_TRACE) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index c95572141..b46e381de 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -158,7 +158,7 @@ spkg-install: ${ALL_POSTINST} ${_FAKE_COOKIE}: ${_BUILD_COOKIE} @-rm -f ${_ALL_CONTROLS} @mkdir -p '${STAGING_PKG_DIR}/stamps' ${WRKINST} '${STAGING_TARGET_DIR}/scripts' - @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) + @${MAKE} -j${ADK_MAKE_JOBS} ${_ALL_CONTROLS} $(MAKE_TRACE) @env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE) ifneq ($(filter meson,${INSTALL_STYLE}),) DESTDIR='$(WRKINST)' PATH='$(HOST_PATH)' \ |