X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=995852e09bdbce3bb983f19c5726365c739c0003;hb=ea689bc52eb353b1d5bb92be1110a491f2072c40;hp=73a015e7a03bcc4b4225ba45b7524c2143e87907;hpb=0d08b7661121b5e68a980188316078ab5518c7c0;p=openwrt.git

diff --git a/rules.mk b/rules.mk
index 73a015e7a0..995852e09b 100644
--- 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),)
@@ -171,8 +173,8 @@ PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config
 export PKG_CONFIG
 
 HOSTCC:=gcc
-HOSTCC_NOCACHE:=$(HOSTCC)
-HOST_CFLAGS:=-O2 -I$(STAGING_DIR_HOST)/include
+HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include
+HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
 HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib
 
 TARGET_CC:=$(TARGET_CROSS)gcc
@@ -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)