domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake.mk: don't assume toolchain binaries in .../bin/ if an external toolchain is used, rely on which instead

Browse Source 
SVN-Revision: 26584
This commit is contained in:
Jo-Philipp Wich
2011-04-11 02:11:11 +00:00
parent 718f5aa78e
commit 0f13d0a068
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/cmake.mk
View File

@@ -3,10 +3,17 @@ PKG_INSTALL:=1
MAKE_FLAGS+=VERBOSE=1 MAKE_FLAGS+=VERBOSE=1
ifeq ($(CONFIG_CCACHE),) ifeq ($(CONFIG_CCACHE),)
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
CMAKE_C_COMPILER_ARG1:= CMAKE_C_COMPILER_ARG1:=
CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX) CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
CMAKE_CXX_COMPILER_ARG1:= CMAKE_CXX_COMPILER_ARG1:=
else
CMAKE_C_COMPILER:=$(shell which $(TARGET_CC))
CMAKE_C_COMPILER_ARG1:=
CMAKE_CXX_COMPILER:=$(shell which $(TARGET_CXX))
CMAKE_CXX_COMPILER_ARG1:=
endif
else else
CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC)) CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))