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

Jump to bottom

[DO_NOT_MERGE] disable system header escape hatch #2426

Closed
wants to merge 1 commit into from
+0 −7
Closed

[DO_NOT_MERGE] disable system header escape hatch #2426

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
3 changes: 0 additions & 3 deletions cmake/CCCLBuildCompilerTargets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ function(cccl_build_compiler_targets)
list(APPEND cuda_compile_definitions "-Xcudafe=--promote_warnings")
list(APPEND cuda_compile_definitions "-Wno-deprecated-gpu-targets")

# Ensure that we build our tests without treating ourself as system header
list(APPEND cxx_compile_definitions "_CCCL_NO_SYSTEM_HEADER")

if ("MSVC" STREQUAL "${CMAKE_CXX_COMPILER_ID}")
list(APPEND cuda_compile_options "--use-local-env")
list(APPEND cxx_compile_options "/bigobj")
Expand Down
1 change: 0 additions & 1 deletion libcudacxx/test/utils/libcudacxx/test/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,6 @@ def configure_compile_flags(self):
# Configure extra flags
compile_flags_str = self.get_lit_conf('compile_flags', '')
self.cxx.compile_flags += shlex.split(compile_flags_str)
self.cxx.compile_flags += ['-D_CCCL_NO_SYSTEM_HEADER']
if self.is_windows:
# FIXME: Can we remove this?
self.cxx.compile_flags += ['-D_CRT_SECURE_NO_WARNINGS']
Expand Down
3 changes: 0 additions & 3 deletions thrust/testing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ function(thrust_add_test target_name_var test_name test_src thrust_target)
target_compile_definitions(${test_target} PRIVATE THRUST_TEST_DEVICE_SIDE)
endif()

# Ensure that we build our tests without treating ourself as system header
target_compile_definitions(${test_target} PRIVATE "_CCCL_NO_SYSTEM_HEADER")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could actually drop this permanently, since we're linking the shared compiler interface targets in here.


thrust_fix_clang_nvcc_build_for(${test_target})

# Add to the active configuration's meta target
Expand Down
Loading