projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath79: align naming of Ubiquiti Nanostation M
[openwrt/staging/chunkeey.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index b1ecc24fab1f9a97a4dd4a7a5c17753996003977..80cb3d63f449fa9e8d9ca72448d7bfe61e9c650d 100644
(file)
--- a/
rules.mk
+++ b/
rules.mk
@@
-140,7
+140,11
@@
else
endif
ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
endif
ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
- iremap = -iremap$(1):$(2)
+ ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y)
+ iremap = -fmacro-prefix-map=$(1)=$(2)
+ else
+ iremap = -iremap$(1):$(2)
+ endif
endif
PACKAGE_DIR:=$(BIN_DIR)/packages
endif
PACKAGE_DIR:=$(BIN_DIR)/packages
@@
-179,8
+183,6
@@
else
LIBGCC_A=$(lastword $(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=$(lastword $(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
-LIBRPC=-lrpc
-LIBRPC_DEPENDS=+librpc
ifeq ($(CONFIG_ARCH_64BIT),y)
LIB_SUFFIX:=64
ifeq ($(CONFIG_ARCH_64BIT),y)
LIB_SUFFIX:=64
@@
-265,6
+267,7
@@
TARGET_CC:=$(TARGET_CROSS)gcc
TARGET_CXX:=$(TARGET_CROSS)g++
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
TARGET_CXX:=$(TARGET_CROSS)g++
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
+ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e
CP:=cp -fpR
LN:=ln -sf
XARGS:=xargs -r
CP:=cp -fpR
LN:=ln -sf
XARGS:=xargs -r
@@
-276,6
+279,7
@@
PATCH:=patch
PYTHON:=python
INSTALL_BIN:=install -m0755
PYTHON:=python
INSTALL_BIN:=install -m0755
+INSTALL_SUID:=install -m4755
INSTALL_DIR:=install -d -m0755
INSTALL_DATA:=install -m0644
INSTALL_CONF:=install -m0600
INSTALL_DIR:=install -d -m0755
INSTALL_DATA:=install -m0644
INSTALL_CONF:=install -m0600