diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-vars.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index e9771855e..17a8d23a2 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -17,4 +17,4 @@ else KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}' endif -KERNEL_MAKE_ENV:= PATH="${STAGING_HOST_DIR}/usr/bin:$$PATH" +KERNEL_MAKE_ENV:= PATH="${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:$$PATH" diff --git a/mk/vars.mk b/mk/vars.mk index 443d42139..c6971ee83 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -74,8 +74,13 @@ ifneq ($(strip ${ADK_USE_CCACHE}),) TARGET_COMPILER_PREFIX=$(STAGING_HOST_DIR)/usr/bin/ccache ${TARGET_CROSS} endif +# use a gcc wrapper for uClinux +ifeq ($(ADK_TARGET_UCLINUX),y) +TARGET_CC:= adk-uclinux-gcc +else # target tools TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc +endif TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld TARGET_AR:= ${TARGET_COMPILER_PREFIX}ar @@ -94,8 +99,8 @@ TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib ifeq ($(ADK_TARGET_BINFMT_FLAT),y) -TARGET_CFLAGS+= -Wl,-elf2flt -msep-data -TARGET_CXXFLAGS+= -Wl,-elf2flt -msep-data +TARGET_CFLAGS+= -msep-data +TARGET_CXXFLAGS+= -msep-data TARGET_LDFLAGS+= -elf2flt endif |