projects
/
openwrt
/
staging
/
jow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qualcommax: add pending GPLL parent fixes
[openwrt/staging/jow.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index 57d7995d4fa8feecba752b92b32cf00091486e12..f298c8d794237c67b18c2698fa5a7c72ce10be16 100644
(file)
--- a/
rules.mk
+++ b/
rules.mk
@@
-211,6
+211,10
@@
ifndef DUMP
endif
endif
endif
endif
endif
endif
+
+TARGET_LINKER?=bfd
+TARGET_LDFLAGS+= -fuse-ld=$(TARGET_LINKER)
+
TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(STAGING_DIR_HOSTPKG)/bin:$(TARGET_PATH)
ifeq ($(CONFIG_SOFT_FLOAT),y)
TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(STAGING_DIR_HOSTPKG)/bin:$(TARGET_PATH)
ifeq ($(CONFIG_SOFT_FLOAT),y)
@@
-227,6
+231,7
@@
else
endif
endif
endif
endif
+export ORIG_PATH:=$(if $(ORIG_PATH),$(ORIG_PATH),$(PATH))
export PATH:=$(TARGET_PATH)
export STAGING_DIR STAGING_DIR_HOST STAGING_DIR_HOSTPKG
export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh;
export PATH:=$(TARGET_PATH)
export STAGING_DIR STAGING_DIR_HOST STAGING_DIR_HOSTPKG
export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh;
@@
-235,8
+240,8
@@
PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config
export PKG_CONFIG
export PKG_CONFIG
-HOSTCC:=gcc
-HOSTCXX:=g++
+HOSTCC:=
$(STAGING_DIR_HOST)/bin/
gcc
+HOSTCXX:=
$(STAGING_DIR_HOST)/bin/
g++
HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
HOST_CXXFLAGS:=
HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
HOST_CXXFLAGS:=
HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
@@
-251,6
+256,7
@@
TARGET_RANLIB:=$(TARGET_CROSS)gcc-ranlib
TARGET_NM:=$(TARGET_CROSS)gcc-nm
TARGET_CC:=$(TARGET_CROSS)gcc
TARGET_CXX:=$(TARGET_CROSS)g++
TARGET_NM:=$(TARGET_CROSS)gcc-nm
TARGET_CC:=$(TARGET_CROSS)gcc
TARGET_CXX:=$(TARGET_CROSS)g++
+TARGET_LD:=$(TARGET_CROSS)ld.$(TARGET_LINKER)
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
FILECMD:=$(STAGING_DIR_HOST)/bin/file
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
FILECMD:=$(STAGING_DIR_HOST)/bin/file
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
@@
-268,6
+274,14
@@
FIND:=find
PATCH:=patch
PYTHON:=python3
PATCH:=patch
PYTHON:=python3
+ifeq ($(HOST_OS),Darwin)
+ TRUE:=/usr/bin/env gtrue
+ FALSE:=/usr/bin/env gfalse
+else
+ TRUE:=/usr/bin/env true
+ FALSE:=/usr/bin/env false
+endif
+
INSTALL_BIN:=install -m0755
INSTALL_SUID:=install -m4755
INSTALL_DIR:=install -d -m0755
INSTALL_BIN:=install -m0755
INSTALL_SUID:=install -m4755
INSTALL_DIR:=install -d -m0755
@@
-296,7
+310,7
@@
endif
TARGET_CONFIGURE_OPTS = \
AR="$(TARGET_AR)" \
AS="$(TARGET_CC) -c $(TARGET_ASFLAGS)" \
TARGET_CONFIGURE_OPTS = \
AR="$(TARGET_AR)" \
AS="$(TARGET_CC) -c $(TARGET_ASFLAGS)" \
- LD=
$(TARGET_CROSS)ld
\
+ LD=
"$(TARGET_LD)"
\
NM="$(TARGET_NM)" \
CC="$(TARGET_CC)" \
GCC="$(TARGET_CC)" \
NM="$(TARGET_NM)" \
CC="$(TARGET_CC)" \
GCC="$(TARGET_CC)" \
@@
-316,7
+330,7
@@
else
STRIP:=$(TARGET_CROSS)strip $(call qstrip,$(CONFIG_STRIP_ARGS))
else
ifneq ($(CONFIG_USE_SSTRIP),)
STRIP:=$(TARGET_CROSS)strip $(call qstrip,$(CONFIG_STRIP_ARGS))
else
ifneq ($(CONFIG_USE_SSTRIP),)
- STRIP:=$(STAGING_DIR_HOST)/bin/sstrip $(
call qstrip,$(CONFIG_SSTRIP_ARGS)
)
+ STRIP:=$(STAGING_DIR_HOST)/bin/sstrip $(
if $(CONFIG_SSTRIP_DISCARD_TRAILING_ZEROES),-z
)
endif
endif
RSTRIP= \
endif
endif
RSTRIP= \
@@
-350,6
+364,7
@@
ifeq ($(CONFIG_BUILD_LOG),y)
endif
export BISON_PKGDATADIR:=$(STAGING_DIR_HOST)/share/bison
endif
export BISON_PKGDATADIR:=$(STAGING_DIR_HOST)/share/bison
+export HOST_GNULIB_SRCDIR:=$(STAGING_DIR_HOST)/share/gnulib
export M4:=$(STAGING_DIR_HOST)/bin/m4
define shvar
export M4:=$(STAGING_DIR_HOST)/bin/m4
define shvar