summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/eglibc/Makefile.inc2
-rw-r--r--toolchain/glibc/Makefile10
-rw-r--r--toolchain/glibc/Makefile.inc2
3 files changed, 6 insertions, 8 deletions
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 8214e2237..d72693fd8 100644
--- a/toolchain/eglibc/Makefile.inc
+++ b/toolchain/eglibc/Makefile.inc
@@ -19,7 +19,7 @@ EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
EGLIBC_ENV:= PATH='${TARGET_PATH}' \
BUILD_CC=${CC_FOR_BUILD} \
GCC_HONOUR_COPTS=s \
- CFLAGS="$(TARGET_CFLAGS)" \
+ CFLAGS="$(TARGET_CFLAGS_LIBC)" \
CC=${REAL_GNU_TARGET_NAME}-gcc \
CXX=${REAL_GNU_TARGET_NAME}-g++ \
AR=${REAL_GNU_TARGET_NAME}-ar \
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 \
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 80d836437..0d37ef3e5 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -21,7 +21,7 @@ GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
--enable-add-ons
GLIBC_ENV:= PATH='${TARGET_PATH}' \
BUILD_CC=${CC_FOR_BUILD} \
- CFLAGS="$(TARGET_CFLAGS)" \
+ CFLAGS="$(TARGET_CFLAGS_LIBC)" \
CC=${REAL_GNU_TARGET_NAME}-gcc \
CXX=${REAL_GNU_TARGET_NAME}-g++ \
AR=${REAL_GNU_TARGET_NAME}-ar \