move LIB_SUFFIX from base-files to rules.mk

[openwrt/staging/mkresin.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 73a015e7a03bcc4b4225ba45b7524c2143e87907..abb961e7dea5ec49bc751411ce8d2aac5e1a56ea 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -119,10 +119,12 @@ else
 LIBGCC_A=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a)
 LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(LIBGCC_A))
 endif
-ifdef CONFIG_USE_UCLIBC
 LIBRPC=-lrpc
+LIBRPC_DEPENDS=+librpc
+
+ifneq ($(findstring $(ARCH) , mips64 x86_64 ),)
+  LIB_SUFFIX:=64
 endif
-LIBRPC_DEPENDS=+USE_UCLIBC:librpc
 
 ifndef DUMP
   ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
@@ -187,11 +189,14 @@ INSTALL_DIR:=install -d -m0755
 INSTALL_DATA:=install -m0644
 INSTALL_CONF:=install -m0600
 
+TARGET_CC_NOCACHE:=$(TARGET_CC)
+TARGET_CXX_NOCACHE:=$(TARGET_CXX)
+HOSTCC_NOCACHE:=$(HOSTCC)
+export TARGET_CC_NOCACHE
+export TARGET_CXX_NOCACHE
+export HOSTCC_NOCACHE
+
 ifneq ($(CONFIG_CCACHE),)
-  TARGET_CC_NOCACHE:=$(TARGET_CC)
-  TARGET_CXX_NOCACHE:=$(TARGET_CXX)
-  export TARGET_CC_NOCACHE
-  export TARGET_CXX_NOCACHE
   TARGET_CC:= ccache_cc
   TARGET_CXX:= ccache_cxx
   HOSTCC:= ccache $(HOSTCC)