diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-12 12:22:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-12 12:22:40 +0200 |
| commit | d72d9c923c973c4f6e6c7dec275a84330f5efe1a (patch) | |
| tree | a9daa6e1ec0bea6fac0787163da96d755e9d86b3 /toolchain/glibc/Makefile | |
| parent | 5565d6ec5d55aa694626d9711e2bc1f11437202c (diff) | |
| parent | ba1029c2f563db27a48957eaf1f989ad9ee1ba7e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain/glibc/Makefile')
| -rw-r--r-- | toolchain/glibc/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 16791824e..98a01d9c8 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk include ../rules.mk # glibc does not compile with Os -TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS)) +TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS)) ifneq ($(ADK_DEBUG),) -TARGET_CFLAGS+= -O2 +TARGET_CFLAGS_LIBC+= -O2 endif # ssp partially supported @@ -39,7 +39,7 @@ $(WRKBUILD)/.headers_configure: (cd $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \ ${GLIBC_ENV} \ CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \ - $(WRKBUILD)/libc/configure \ + $(WRKBUILD)/configure \ --prefix=$(STAGING_TARGET_DIR)-$${abi/*:/}/usr \ --with-sysroot=$(STAGING_TARGET_DIR)-$${abi/*:/} \ --host=$${abi/:*/} \ @@ -56,8 +56,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure $(MAKE) ${GLIBC_MAKEOPTS} install-headers \ ); \ done - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h touch $@ else $(WRKBUILD)/.headers_configure: @@ -90,7 +88,7 @@ $(WRKBUILD)/.configured: (cd $(GLIBC_BUILD_DIR_FINAL)-$${abi/*:/}; \ ${GLIBC_ENV} \ CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \ - $(WRKBUILD)/libc/configure \ + $(WRKBUILD)/configure \ --prefix=/usr \ --enable-shared \ --enable-stackguard-randomization \ |