Skip to content

Commit bce7bea

Browse files
committed
fixup! build: Generate share/toolchain.cmake in depends
Process linker flags properly.
1 parent 138cd2e commit bce7bea

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

depends/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@ $(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_
282282
-e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS))|' \
283283
-e 's|@CPPFLAGS_RELEASE@|$(strip $(host_release_CPPFLAGS))|' \
284284
-e 's|@CPPFLAGS_DEBUG@|$(strip $(host_debug_CPPFLAGS))|' \
285+
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS))|' \
286+
-e 's|@LDFLAGS_RELEASE@|$(strip $(host_release_LDFLAGS))|' \
287+
-e 's|@LDFLAGS_DEBUG@|$(strip $(host_debug_LDFLAGS))|' \
285288
-e 's|@no_qt@|$(NO_QT)|' \
286289
-e 's|@no_qr@|$(NO_QR)|' \
287290
-e 's|@no_zmq@|$(NO_ZMQ)|' \

depends/toolchain.cmake.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,16 @@ set(DEPENDS_COMPILE_DEFINITIONS @CPPFLAGS@)
7373
set(DEPENDS_COMPILE_DEFINITIONS_RELWITHDEBINFO @CPPFLAGS_RELEASE@)
7474
set(DEPENDS_COMPILE_DEFINITIONS_DEBUG @CPPFLAGS_DEBUG@)
7575

76+
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_INIT)
77+
set(CMAKE_EXE_LINKER_FLAGS_INIT "@LDFLAGS@")
78+
endif()
79+
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT)
80+
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "@LDFLAGS_RELEASE@")
81+
endif()
82+
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT)
83+
set(CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "@LDFLAGS_DEBUG@")
84+
endif()
85+
7686
set(CMAKE_AR "@AR@")
7787
set(CMAKE_RANLIB "@RANLIB@")
7888
set(CMAKE_STRIP "@STRIP@")

0 commit comments

Comments
 (0)