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

Minor build system cleanup #1304

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Minor build system cleanup #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bc2662
cmake cleanup: Remove CBSE remnants
slipher Sep 15, 2024
4a64c9f
cmake cleanup: force nacl-vms build an easier way
slipher Sep 15, 2024
e8d64b9
cmake: remove a couple unnecessary flags on NaCl
slipher Sep 15, 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
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ set(DEFAULT_NACL_VM_INHERITED_OPTIONS
BUILD_CGAME
BUILD_SGAME
CMAKE_BUILD_TYPE
DAEMON_CBSE_PYTHON_PATH
USE_ARCH_INTRINSICS
USE_COMPILER_CUSTOMIZATION
USE_COMPILER_INTRINSICS
Expand Down
81 changes: 0 additions & 81 deletions cmake/DaemonCBSE.cmake
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cmake/DaemonFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ else()

# The -pthread flag sets some preprocessor defines,
# it is also used to link with libpthread on Linux.
if (NOT APPLE)
if (LINUX OR FREEBSD)
try_c_cxx_flag(PTHREAD "-pthread")
Copy link
Member

Choose a reason for hiding this comment

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

See #1305:

endif()

Expand All @@ -315,7 +315,7 @@ else()
endif()

# Hardening.
if (USE_HARDENING OR NOT MINGW)
if (USE_HARDENING OR (NOT MINGW AND NOT NACL))
Copy link
Member

Choose a reason for hiding this comment

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

If that should not be used with NaCl, the USE_HARDENING name can be removed from set(DEFAULT_NACL_VM_INHERITED_OPTIONS …) in CMakeLists.txt (better do both).

# MinGW with _FORTIFY_SOURCE and without -fstack-protector
# causes unsatisfied dependency on libssp.
# https://github.com/msys2/MINGW-packages/issues/5868
Expand Down
9 changes: 1 addition & 8 deletions cmake/DaemonGame.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ function(GAMEMODULE)
ExternalProject_Add(${vm}
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${vm}
BUILD_ALWAYS TRUE
CMAKE_GENERATOR ${VM_GENERATOR}
CMAKE_ARGS
-DFORK=2
Expand All @@ -97,14 +98,6 @@ function(GAMEMODULE)
${inherited_option_args}
INSTALL_COMMAND ""
)
ExternalProject_Add_Step(${vm} forcebuild
COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BINARY_DIR}/${vm}-prefix/src/${vm}-stamp/${vm}-configure
COMMENT "Forcing build step for '${vm}'"
DEPENDEES build
ALWAYS 1
)

endif()
else()
if (FORK EQUAL 2)
Expand Down