diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:31:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:31:31 +0200 |
| commit | 1a3c8bc113260f144f3e173201b9a3468a53119d (patch) | |
| tree | 362e503cd750cb8162e7b7596850d00b5747d3e4 /mk | |
| parent | c9d72815880524c041e37f23813ba777093a27d2 (diff) | |
| parent | 681a668edf704bbb000a49c835b3d71fa7035d86 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mk/package.mk b/mk/package.mk index 9f38d5b8d..07f53aa34 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -38,7 +38,7 @@ FAKE_FLAGS?= ALL_TARGET?= all INSTALL_TARGET?= install -MAKE_ENV+= GCC_HONOUR_COPTS=2 \ +MAKE_ENV+= $(GCC_CHECK) \ PATH='${TARGET_PATH}' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ diff --git a/mk/vars.mk b/mk/vars.mk index e77726943..896307026 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -47,6 +47,12 @@ TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_ REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux +ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),) +GCC_CHECK:= GCC_HONOUR_COPTS=2 +else +GCC_CHECK:= +endif + ifeq ($(CPU_ARCH),arm) QEMU:= qemu-arm endif |