diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 10:59:12 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 10:59:12 +0100 |
| commit | a217fc80b29080dae963bb15051df023de36ce39 (patch) | |
| tree | e69fc812c517d767ca1a24a60cc2b9c8ce1bb3c0 /toolchain/uClibc | |
| parent | 7709c0e4f3a9ea4fddbe5764c000135f9eacac49 (diff) | |
add LTO support to toolchain settings. Cleanup SYSROOT mess.
- just use on sysroot directory for toolchain.
- add missing patches from previos commit. (rpath/cflags cleanup)
Diffstat (limited to 'toolchain/uClibc')
| -rw-r--r-- | toolchain/uClibc/Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index e04985dac..cc63b9e5f 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -14,18 +14,28 @@ endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak - sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \ + sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ $(TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config ifneq ($(ADK_DEBUG),) $(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config endif -ifneq ($(ADK_TOOLCHAIN_GCC_SSP),) +ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) $(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config + echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config + echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config + echo "UCLIBC_BUILD_SSP=y" >> ${WRKBUILD}/.config endif + echo N|$(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ + PREFIX=$(STAGING_TARGET_DIR) \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ + HOSTCC="$(HOSTCC)" \ + CPU_CFLAGS="$(TARGET_CFLAGS)" \ + oldconfig $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ - PREFIX=$(TOOLCHAIN_SYSROOT) \ + PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(TOOLCHAIN_SYSROOT) \ + RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ HOSTCC="$(HOSTCC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ install_headers |