diff options
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 12 | ||||
| -rw-r--r-- | toolchain/uclibc/Makefile | 12 |
2 files changed, 13 insertions, 11 deletions
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index d13eeb0cb..2bc6e258e 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -64,25 +64,27 @@ ifeq ($(ADK_TARGET_USE_SSP),y) echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config echo "UCLIBC_BUILD_SSP=y" >> ${WRKBUILD}/.config endif - echo N|$(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + echo N| PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ HOSTCC="$(HOST_CC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ + V=1 \ oldconfig - $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ HOSTCC="$(HOST_CC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ + V=1 \ install_headers touch $(WRKBUILD)/.configured touch $@ $(WRKBUILD)/.compiled: - $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX= \ DEVEL_PREFIX=/ \ RUNTIME_PREFIX=/ \ @@ -92,7 +94,7 @@ $(WRKBUILD)/.compiled: touch $@ $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled - $(MAKE) -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ DEVEL_PREFIX_LIB=/ \ @@ -105,7 +107,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers touch $@ $(WRKBUILD)/.fixup: - $(MAKE) -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ DEVEL_PREFIX_LIB=/ \ diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile index 744b1da8f..8eae50526 100644 --- a/toolchain/uclibc/Makefile +++ b/toolchain/uclibc/Makefile @@ -17,7 +17,7 @@ endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak - sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ + PATH='$(HOST_PATH)' sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config ifeq ($(ADK_TARGET_ENDIAN),little) $(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config @@ -64,14 +64,14 @@ ifeq ($(ADK_TARGET_USE_SSP),y) echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config echo "UCLIBC_BUILD_SSP=y" >> ${WRKBUILD}/.config endif - echo N|$(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + echo N|PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ HOSTCC="$(HOST_CC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ oldconfig - $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ @@ -82,7 +82,7 @@ endif touch $@ $(WRKBUILD)/.compiled: - $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ PREFIX= \ DEVEL_PREFIX=/ \ RUNTIME_PREFIX=/ \ @@ -92,7 +92,7 @@ $(WRKBUILD)/.compiled: touch $@ $(WRKBUILD)/.install_headers: $(WRKBUILD)/.compiled - $(MAKE) -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ DEVEL_PREFIX_LIB=/ \ @@ -105,7 +105,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers touch $@ $(WRKBUILD)/.fixup: - $(MAKE) -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ DEVEL_PREFIX_LIB=/ \ |