cmake.mk: fix passing of LDFLAGS
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 9 Jan 2012 05:42:04 +0000 (05:42 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 9 Jan 2012 05:42:04 +0000 (05:42 +0000)
SVN-Revision: 29701

include/cmake.mk

index ad9744d3fd96289ac109534436ec77e87d488353..4701020f91863cccb4a5b7e5c6a51b1cbf5d377f 100644 (file)
@@ -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 \