aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/glibc
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-20 19:12:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-20 19:12:01 +0000
commit1981ee7d7515524e5a5485a2b5dc8a4c86691a18 (patch)
tree96cc2d8f930969e6a6d718064e4dd95303320512 /toolchain/glibc
parent35a17334eba70a7dc984f0ad2c78f3e676b0bfcb (diff)
downloadupstream-1981ee7d7515524e5a5485a2b5dc8a4c86691a18.tar.gz
upstream-1981ee7d7515524e5a5485a2b5dc8a4c86691a18.tar.bz2
upstream-1981ee7d7515524e5a5485a2b5dc8a4c86691a18.zip
toolchain: Reverse glibc/eglibc conditionals to check for eglibc
This will make adding future glibc versions easier because the conditionals won't have to be modified again. Signed-off-by: Michael Marley <michael@michaelmarley.com> SVN-Revision: 48399
Diffstat (limited to 'toolchain/glibc')
-rw-r--r--toolchain/glibc/common.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 052050576a..bc50fcb69e 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -72,10 +72,10 @@ export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include
define Host/SetToolchainInfo
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
-ifneq ($(CONFIG_GLIBC_VERSION_2_21),)
- $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk
-else
+ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)
$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.org/,' $(TOOLCHAIN_DIR)/info.mk
+else
+ $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk
endif
$(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
@@ -97,7 +97,7 @@ endef
define Host/Prepare
$(call Host/Prepare/Default)
ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
-ifeq ($(CONFIG_GLIBC_VERSION_2_21)$(CONFIG_GLIBC_VERSION_2_22),)
+ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)
$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
endif
endef