projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/mpc: remove bogus configure override
[openwrt/svn-archive/archive.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index 412615c3203b0224e68ab4239c6e1f6f39b5e5b3..995852e09bdbce3bb983f19c5726365c739c0003 100644
(file)
--- a/
rules.mk
+++ b/
rules.mk
@@
-122,6
+122,10
@@
endif
LIBRPC=-lrpc
LIBRPC_DEPENDS=+librpc
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
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
export PKG_CONFIG
HOSTCC:=gcc
-HOST
CC_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
HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib
TARGET_CC:=$(TARGET_CROSS)gcc
@@
-185,13
+189,14
@@
INSTALL_DIR:=install -d -m0755
INSTALL_DATA:=install -m0644
INSTALL_CONF:=install -m0600
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),)
ifneq ($(CONFIG_CCACHE),)
- TARGET_CC_NOCACHE:=$(TARGET_CC)
- TARGET_CXX_NOCACHE:=$(TARGET_CXX)
- HOSTCC_NOCACHE:=$(HOSTCC)
- export TARGET_CC_NOCACHE
- export TARGET_CXX_NOCACHE
- export HOSTCC_NOCACHE
TARGET_CC:= ccache_cc
TARGET_CXX:= ccache_cxx
HOSTCC:= ccache $(HOSTCC)
TARGET_CC:= ccache_cc
TARGET_CXX:= ccache_cxx
HOSTCC:= ccache $(HOSTCC)