summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-09 05:42:04 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-09 05:42:04 +0000
commita808a8e5276ff8e3012d1b54b9c3f29744889620 (patch)
treefe47864c2c663fe003dd5934a6f2599d1ae838cc
parent01360fc7c4b1b3690a5a6e3890faaeeeea373476 (diff)
[include] cmake.mk: fix passing of LDFLAGS
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29701 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 \