Skip to content

[boost-modular-build-helper] Wrap compiler flags with quotes #22371

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

Closed
ahojnnes wants to merge 4 commits into from
Closed

[boost-modular-build-helper] Wrap compiler flags with quotes #22371

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0b5b19
[boost-modular-build-helper] Wrap compiler flags with quotes
ahojnnes Jan 5, 2022
becd446
Debug linkflags
ahojnnes Jan 5, 2022
1d19af2
Merge branch 'master' of https://github.com/Microsoft/vcpkg into user…
PhoebeHui Jan 29, 2022
a16bad4
Address the review suggestions
PhoebeHui Jan 29, 2022
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
29 changes: 15 additions & 14 deletions ports/boost-modular-build-helper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,41 +122,42 @@ string(REGEX REPLACE "[ \t\r\n]+" " " LDFLAGS "${LDFLAGS}")
string(STRIP "${LDFLAGS}" LDFLAGS)

if(NOT CXXFLAGS STREQUAL "")
string(REPLACE " " " <cxxflags>" CXXFLAGS "<cxxflags>${CXXFLAGS}")
string(REPLACE " " "\" <cxxflags>\"" CXXFLAGS "<cxxflags>\"${CXXFLAGS}\"")
endif()
if(NOT CFLAGS STREQUAL "")
string(REPLACE " " " <cflags>" CFLAGS "<cflags>${CFLAGS}")
string(REPLACE " " "\" <cflags>\"" CFLAGS "<cflags>\"${CFLAGS}\"")
endif()
if(NOT LDFLAGS STREQUAL "")
string(REPLACE " " " <linkflags>" LDFLAGS "<linkflags>${LDFLAGS}")
list(APPEND B2_OPTIONS linkflags="${LDFLAGS}")
Comment thread
PhoebeHui marked this conversation as resolved.
Outdated
string(REPLACE " " "\" <linkflags>\"" LDFLAGS "<linkflags>\"${LDFLAGS}\"")
endif()

if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"")
string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"")
else()
string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <compileflags>${CMAKE_CXX_COMPILER_TARGET}")
string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <linkflags>${CMAKE_CXX_COMPILER_TARGET}")
string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}\" <compileflags>\"${CMAKE_CXX_COMPILER_TARGET}\"")
string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}\" <linkflags>\"${CMAKE_CXX_COMPILER_TARGET}\"")
endif()
endif()

if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
else()
string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <compileflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <linkflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}\" <compileflags>\"${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}\" <linkflags>\"${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
endif()
endif()

if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT)
string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"")
string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"")
endif()
foreach(INCDIR IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES)
string(APPEND CXXFLAGS " <compileflags>${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}")
string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}\"")
endforeach()

if(APPLE)
Expand Down