Skip to content

build: sync infra to 749c558 for CMake 4.4 and libc++ _FORTIFY_SOURCE #81

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
steve-downey wants to merge 1 commit into from
Closed

build: sync infra to 749c558 for CMake 4.4 and libc++ _FORTIFY_SOURCE #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion infra/.beman_submodule
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[beman_submodule]
remote=https://github.com/bemanproject/infra.git
commit_hash=7b66b858d7f48428fca936184aef2bd246ccc81a
commit_hash=749c5588afe37daaa290b659d439cd7cd473ad1b
6 changes: 5 additions & 1 deletion infra/cmake/enable-experimental-import-std.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.4.0")
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
"f35a9ac6-8463-4d38-8eec-5d6008153e7d"
)
elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
"451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
)
Expand Down
5 changes: 4 additions & 1 deletion infra/cmake/llvm-libc++-toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@
include(${CMAKE_CURRENT_LIST_DIR}/llvm-toolchain.cmake)

if(NOT CMAKE_CXX_FLAGS MATCHES "-stdlib=libc\\+\\+")
string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
string(
APPEND CMAKE_CXX_FLAGS
" -stdlib=libc++ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
)
endif()
Loading