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 | b31d6f5d303f91b9f04adb323ba785186a1ab43e (patch) | |
| tree | 427bb63de9399844dbda526b01772e2f62c61d6b /package | |
| parent | 1da4c3587891cd86c204ffe1cbfc9beb9d1f2313 (diff) | |
| download | master-187ad058-b31d6f5d303f91b9f04adb323ba785186a1ab43e.tar.gz master-187ad058-b31d6f5d303f91b9f04adb323ba785186a1ab43e.tar.bz2 master-187ad058-b31d6f5d303f91b9f04adb323ba785186a1ab43e.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48399 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -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)/ |