Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #16882: Generated CMake build when using tools.build.linker_scripts #16883

Merged
merged 7 commits into from
Aug 28, 2024
Merged

Fix for #16882: Generated CMake build when using tools.build.linker_scripts #16883

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7feb4f3
Fix for generated CMake build when using tools.build.linker_scripts
photex Aug 27, 2024
09d3616
Avoids the warning regarding arguments not being separated by space.
photex Aug 27, 2024
2a3fa3f
Merge branch 'develop2' into dev/chip/cmake_linker_scripts
memsharded Aug 28, 2024
04b5db7
fix test
memsharded Aug 28, 2024
dd033d1
Merge branch 'develop2' into dev/chip/cmake_linker_scripts
czoido Aug 28, 2024
529faee
Merge branch 'develop2' into dev/chip/cmake_linker_scripts
memsharded Aug 28, 2024
5dc917e
fix test
memsharded Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conan/tools/cmake/toolchain/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class LinkerScriptsBlock(Block):
# Add linker flags from tools.build:linker_scripts conf

message(STATUS "Conan toolchain: Defining linker script flag: {{ linker_script_flags }}")
string(APPEND CONAN_EXE_LINKER_FLAGS {{ linker_script_flags }})
string(APPEND CONAN_EXE_LINKER_FLAGS " {{ linker_script_flags }}")
""")

def context(self):
Expand All @@ -265,7 +265,7 @@ def context(self):
linker_scripts = [linker_script.replace('\\', '/') for linker_script in linker_scripts]
linker_scripts = [relativize_path(p, self._conanfile, "${CMAKE_CURRENT_LIST_DIR}")
for p in linker_scripts]
linker_script_flags = ['-T"' + linker_script + '"' for linker_script in linker_scripts]
linker_script_flags = ['-T' + linker_script for linker_script in linker_scripts]
photex marked this conversation as resolved.
Show resolved Hide resolved
return {"linker_script_flags": " ".join(linker_script_flags)}


Expand Down