From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 9 Jan 2012 05:42:04 +0000 (+0000)
Subject: [include] cmake.mk: fix passing of LDFLAGS
X-Git-Tag: fast2504n-3.10.28-merged~7344
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=a808a8e5276ff8e3012d1b54b9c3f29744889620;p=openwrt.git

[include] cmake.mk: fix passing of LDFLAGS


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29701 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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 \