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
build: pass MAKE_JOBSERVER via environment to avoid leaking it to error messages
[openwrt/svn-archive/archive.git]
/
include
/
cmake.mk
diff --git
a/include/cmake.mk
b/include/cmake.mk
index c83be1522e17a7032d1b6d50bf0afe6faabc2cd4..4c4af502cc3889955c5ad69aef78f8f97cf54bb1 100644
(file)
--- a/
include/cmake.mk
+++ b/
include/cmake.mk
@@
-1,16
+1,29
@@
PKG_INSTALL:=1
PKG_INSTALL:=1
-MAKE_FLAGS+=VERBOSE=1
+ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
+ MAKE_FLAGS+=VERBOSE=1
+endif
ifeq ($(CONFIG_CCACHE),)
ifeq ($(CONFIG_CCACHE),)
+ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
CMAKE_C_COMPILER_ARG1:=
CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
CMAKE_CXX_COMPILER_ARG1:=
CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
CMAKE_C_COMPILER_ARG1:=
CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
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
+ CCACHE:=$(shell which ccache)
+ ifeq ($(CCACHE),)
+ CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
+ endif
+ CMAKE_C_COMPILER:=$(CCACHE)
CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
- CMAKE_CXX_COMPILER:=$(
STAGING_DIR_HOST)/bin/ccache
+ CMAKE_CXX_COMPILER:=$(
CCACHE)
CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
endif
CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
endif
@@
-18,6
+31,7
@@
define Build/Configure/Default
(cd $(PKG_BUILD_DIR); \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
(cd $(PKG_BUILD_DIR); \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
cmake \
-DCMAKE_SYSTEM_NAME=Linux \
-DCMAKE_SYSTEM_VERSION=1 \
cmake \
-DCMAKE_SYSTEM_NAME=Linux \
-DCMAKE_SYSTEM_VERSION=1 \
@@
-29,15
+43,16
@@
define Build/Configure/Default
-DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
-DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
-DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
-DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
-DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
-DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
- -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
- -DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
- -DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
+ -DCMAKE_EXE_LINKER_FLAGS
:STRING
="$(TARGET_LDFLAGS)" \
+ -DCMAKE_MODULE_LINKER_FLAGS
:STRING
="$(TARGET_LDFLAGS)" \
+ -DCMAKE_SHARED_LINKER_FLAGS
:STRING
="$(TARGET_LDFLAGS)" \
-DCMAKE_FIND_ROOT_PATH=$(STAGING_DIR) \
-DCMAKE_FIND_ROOT_PATH=$(STAGING_DIR) \
- -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=
$(STAGING_DIR_HOST)
\
- -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=
$(STAGING_DIR)
\
- -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=
$(STAGING_DIR)
\
+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=
BOTH
\
+ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=
ONLY
\
+ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=
ONLY
\
-DCMAKE_STRIP=: \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_STRIP=: \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DDL_LIBRARY=$(STAGING_DIR) \
$(CMAKE_OPTIONS) \
. \
)
$(CMAKE_OPTIONS) \
. \
)