projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[include] prereq-build.mk: do not perform static linking tests on Darwin
[openwrt.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index
f6e748c
..
b7bad1c
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
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=-lrpc
+LIBRPC_DEPENDS=+librpc
+
+ifneq ($(findstring $(ARCH) , mips64 x86_64 ),)
+ LIB_SUFFIX:=64
endif
endif
-LIBRPC_DEPENDS=+USE_UCLIBC:librpc
ifndef DUMP
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
ifndef DUMP
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
@@
-171,7
+173,6
@@
PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config
export PKG_CONFIG
HOSTCC:=gcc
export PKG_CONFIG
HOSTCC:=gcc
-HOSTCC_NOCACHE:=$(HOSTCC)
HOST_CFLAGS:=-O2 -I$(STAGING_DIR_HOST)/include
HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib
HOST_CFLAGS:=-O2 -I$(STAGING_DIR_HOST)/include
HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib
@@
-187,9
+188,16
@@
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:= ccache
$(TARGET_CC)
- TARGET_CXX:= ccache
$(TARGET_CXX)
+ TARGET_CC:= ccache
_cc
+ TARGET_CXX:= ccache
_cxx
HOSTCC:= ccache $(HOSTCC)
endif
HOSTCC:= ccache $(HOSTCC)
endif