X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=rules.mk;h=995852e09bdbce3bb983f19c5726365c739c0003;hp=83bc6221669375c97251739829d1aa0576716134;hb=7db87deba8561493366c92018514f2fbb354a199;hpb=2596ce996ad67279f8ba461ee1df38ce0107d2c7 diff --git a/rules.mk b/rules.mk index 83bc622166..995852e09b 100644 --- a/rules.mk +++ b/rules.mk @@ -122,6 +122,10 @@ endif LIBRPC=-lrpc LIBRPC_DEPENDS=+librpc +ifneq ($(findstring $(ARCH) , mips64 x86_64 ),) + LIB_SUFFIX:=64 +endif + ifndef DUMP ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) -include $(TOOLCHAIN_DIR)/info.mk @@ -169,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 @@ -185,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)