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/glibc | |
| 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/glibc')
| -rw-r--r-- | toolchain/glibc/Makefile | 11 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 4d39e2b27..96dc99302 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -31,21 +31,21 @@ $(WRKBUILD)/.headers_configure: (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(WRKBUILD)/configure \ - --prefix=$(TOOLCHAIN_SYSROOT)/usr \ - --with-sysroot=$(TOOLCHAIN_SYSROOT) \ + --prefix=$(STAGING_TARGET_DIR)/usr \ + --with-sysroot=$(STAGING_TARGET_DIR) \ ${GLIBC_CONFOPTS} \ ); touch $@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure - mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib + mkdir -p $(STAGING_TARGET_DIR)/usr/lib (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(MAKE) ${GLIBC_MAKEOPTS} \ cross-compiling=yes \ install-headers \ ); - touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h touch $@ $(WRKBUILD)/.configured: @@ -67,7 +67,6 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.installed: ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \ install_root=$(STAGING_TARGET_DIR) install - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(WRKBUILD)/.installed + touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index ff4753465..d7bcecb13 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -9,7 +9,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_PORTS_VERSION:= 2.12 GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ --disable-nls \ --disable-sanity-checks \ --disable-nls \ |