Skip to content

Regenerate with autotools/gnu toolchain update. #820

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

Merged
pmienk merged 1 commit into from
Jul 3, 2026
Merged

Regenerate with autotools/gnu toolchain update. #820

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
16 changes: 8 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ Makefile.in
.libs
*.la
*.lo
/aclocal.m4
/autom4te.cache
/build-aux
/config.*
/configure
/libtool
.dirstamp
builds/gnu/aclocal.m4
builds/gnu/autom4te.cache
builds/gnu/build-aux
builds/gnu/config.*
builds/gnu/configure
builds/gnu/libtool
builds/gnu/.dirstamp

# pkg-config pc file from .pc.in
*.pc
builds/gnu/*.pc

# msbuild/msvc
/.vs
Expand Down
267 changes: 0 additions & 267 deletions Makefile.am
View file
Open in desktop

This file was deleted.

18 changes: 6 additions & 12 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,12 @@ endif()
#------------------------------------------------------------------------------
# Project options.
#------------------------------------------------------------------------------
option( with-tests "Build tests." ON )
option( with-console "Build console." ON )
option( with-tests "Compile with unit tests." ON )
option( with-console "Compile with console application." ON )

#------------------------------------------------------------------------------
# Dependencies.
#------------------------------------------------------------------------------

if ( BUILD_SHARED_LIBS )
set( libbitcoin-node_USE_STATIC_LIBS "OFF" )
set( Boost_USE_STATIC_LIBS "OFF" )
Expand All @@ -96,7 +95,6 @@ find_package( Boost 1.86.0 REQUIRED
#------------------------------------------------------------------------------
# Compiler options.
#------------------------------------------------------------------------------

include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles)
Expand Down Expand Up @@ -168,13 +166,8 @@ endif()
#------------------------------------------------------------------------------
# Linker options.
#------------------------------------------------------------------------------

include(CheckLinkerFlag)

#------------------------------------------------------------------------------
# Configurable file(s).
#------------------------------------------------------------------------------

#------------------------------------------------------------------------------
# libbitcoin-server library
#------------------------------------------------------------------------------
Expand All @@ -196,7 +189,7 @@ target_compile_options( libbitcoin-server
$<$<COMPILE_LANGUAGE:CXX>:-Wno-comment>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-copy>
$<$<CXX_COMPILER_ID:Clang>:-Wno-mismatched-tags>
-fstack-protector-all
$<$<COMPILE_LANGUAGE:CXX>:-fstack-protector-all>
)

file( GLOB_RECURSE libbitcoin_server_HEADERS CONFIGURE_DEPENDS
Expand Down Expand Up @@ -275,7 +268,7 @@ if ( with-tests )
$<$<CXX_COMPILER_ID:Clang>:-Wno-mismatched-tags>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-long-long>
$<$<CXX_COMPILER_ID:GNU>:-fno-var-tracking-assignments>
-fstack-protector-all
$<$<COMPILE_LANGUAGE:CXX>:-fstack-protector-all>
)

file( GLOB_RECURSE libbitcoin_server_test_SOURCES CONFIGURE_DEPENDS
Expand Down Expand Up @@ -325,7 +318,7 @@ if ( with-console )
$<$<CXX_COMPILER_ID:Clang>:-Wno-mismatched-tags>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-long-long>
$<$<CXX_COMPILER_ID:GNU>:-fno-var-tracking-assignments>
-fstack-protector-all
$<$<COMPILE_LANGUAGE:CXX>:-fstack-protector-all>
)

file( GLOB_RECURSE bitcoin_server_HEADERS CONFIGURE_DEPENDS
Expand Down Expand Up @@ -368,6 +361,7 @@ if ( with-console )
OUTPUT_NAME bs
)
endif()

#------------------------------------------------------------------------------
# Installation routine.
#------------------------------------------------------------------------------
Expand Down
Loading
Loading