diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 19:12:01 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 19:12:01 +0000 |
commit | 1981ee7d7515524e5a5485a2b5dc8a4c86691a18 (patch) | |
tree | 96cc2d8f930969e6a6d718064e4dd95303320512 /package/libs/toolchain | |
parent | 35a17334eba70a7dc984f0ad2c78f3e676b0bfcb (diff) | |
download | upstream-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 'package/libs/toolchain')
-rw-r--r-- | package/libs/toolchain/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile index 5c2b9bb745..b54128fe38 100644 --- a/package/libs/toolchain/Makefile +++ b/package/libs/toolchain/Makefile @@ -366,9 +366,9 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/usr/lib/ endef - use_libutil=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil) - use_libnsl=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl) - use_nsswitch=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files) + use_libutil=$(if $(if $(CONFIG_EGLIBC_USE_VERSION_2_19),$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),y),libutil) + use_libnsl=$(if $(if $(CONFIG_EGLIBC_USE_VERSION_2_19),$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),y),libnsl) + use_nsswitch=$(if $(if $(CONFIG_EGLIBC_USE_VERSION_2_19),$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),y),libnss_dns libnss_files) define Package/glibc/install $(CP) ./glibc-files/* $(1)/ |