summaryrefslogtreecommitdiffstats
path: root/include/cmake.mk
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-01-09 05:42:04 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-01-09 05:42:04 +0000
commit9054bc91b3cca5df93990ac93af504b92e96573f (patch)
treec42853b5391ea7ee63c9f695239c75d7a85d437e /include/cmake.mk
parent690701d26e73e6528efb97fd6739cc045312c281 (diff)
downloadmaster-31e0f0ae-9054bc91b3cca5df93990ac93af504b92e96573f.tar.gz
master-31e0f0ae-9054bc91b3cca5df93990ac93af504b92e96573f.tar.bz2
master-31e0f0ae-9054bc91b3cca5df93990ac93af504b92e96573f.zip
cmake.mk: fix passing of LDFLAGS
SVN-Revision: 29701
Diffstat (limited to 'include/cmake.mk')
-rw-r--r--include/cmake.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/cmake.mk b/include/cmake.mk
index ad9744d3fd..4701020f91 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -29,6 +29,7 @@ define Build/Configure/Default
(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 \
@@ -40,9 +41,9 @@ 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_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_MODE_PROGRAM=BOTH \
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \