Skip to content

Fix (lack of) building without C++11 support #497

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
grisumbras wants to merge 3 commits into from
Closed

Fix (lack of) building without C++11 support #497

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
a160c55
Revert "gcc-4.8 is supported"
grisumbras Feb 5, 2021
0312b1e
GCC 4.8 is supported
grisumbras Feb 5, 2021
ffc82d3
Adds check for build being a no-op with cxxstd=03
grisumbras Feb 8, 2021
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: 1 addition & 0 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def main(ctx):
linux_cxx("Clang 10", "clang++-10", packages=" ".join(addon_clang_10["apt"]["packages"]), llvm_os="bionic", llvm_ver="10", buildtype="boost", environment={"B2_TOOLSET": "clang-10", "B2_CXXSTD": "17,2a"}),
linux_cxx("Clang 11 standalone", "clang++-11", packages=" ".join(addon_clang_11["apt"]["packages"]), llvm_os="bionic", llvm_ver="11", buildtype="standalone", environment={"COMMENT": "standalone", "CXX":"clang++-11"}),
linux_cxx("Clang 11", "clang++-11", packages=" ".join(addon_clang_11["apt"]["packages"]), llvm_os="bionic", llvm_ver="11", buildtype="boost", environment={"B2_TOOLSET": "clang-11", "B2_CXXSTD":"17,2a"}),
linux_cxx("gcc 4.8 C++03 (no op)", "g++-4.8", packages=" ".join(addon_gcc_48["apt"]["packages"]), image="ubuntu:14.04", buildtype="boost", environment={"B2_TOOLSET": "gcc-4.8", "B2_CXXSTD": "03"}),
linux_cxx("gcc 4.8", "g++-4.8", packages=" ".join(addon_gcc_48["apt"]["packages"]), image="ubuntu:14.04", buildtype="boost", environment={"B2_TOOLSET": "gcc-4.8", "B2_CXXSTD": "11"}),
linux_cxx("gcc 4.9", "g++-4.9", packages=" ".join(addon_gcc_49["apt"]["packages"]), image="ubuntu:14.04", buildtype="boost", environment={"B2_TOOLSET": "gcc-4.9", "B2_CXXSTD": "11"}),
linux_cxx("gcc 5", "g++-5", packages=" ".join(addon_gcc_5["apt"]["packages"]), image="ubuntu:16.04", buildtype="boost", environment={"B2_TOOLSET": "gcc-5", "B2_CXXSTD": "11"}),
Expand Down
30 changes: 15 additions & 15 deletions Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ import ../config/checks/config : requires ;
# These make sure we only build on
# compatible C++11 or later toolchains.
obj check_basic_alignas : check/basic_alignas.cpp ;
alias c11-requires
: requirements
[ requires
cxx11_constexpr
cxx11_decltype
cxx11_hdr_tuple
cxx11_template_aliases
cxx11_variadic_templates
]
# We only require limited alignas support,
# so we have to use a custom check
[ check-target-builds
check_basic_alignas cxx11_basic_alignas : : <build>no
]
explicit check_basic_alignas ;

constant c11-requires :
[ requires
cxx11_constexpr
cxx11_decltype
cxx11_hdr_tuple
cxx11_template_aliases
cxx11_variadic_templates
]
# We only require limited alignas support,
# so we have to use a custom check
[ check-target-builds
..//check_basic_alignas cxx11_basic_alignas : : <build>no
]
;
explicit basic_alignas c11-requires ;

path-constant LIB_DIR : . ;

Expand Down
2 changes: 1 addition & 1 deletion bench/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ else
LIB = <library>/boost/json//boost_json ;
}

project : requirements <source>..//c11-requires ;
project : requirements $(c11-requires) ;

exe bench :
bench.cpp
Expand Down
2 changes: 1 addition & 1 deletion example/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ else
LIB = <library>/boost/json//boost_json ;
}

project : requirements <source>..//c11-requires ;
project : requirements $(c11-requires) ;

exe path :
path.cpp
Expand Down
2 changes: 2 additions & 0 deletions fuzzing/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ else
LIB = <library>/boost/json//boost_json ;
}

project : requirements $(c11-requires) ;

# See the comments in CMakeLists.txt for why
# these are libraries and not exe targets.
lib fuzzerlib_basic_parser :
Expand Down
2 changes: 1 addition & 1 deletion test/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ local LIMIT_SOURCES =

local RUN_TESTS ;

project : requirements <source>..//c11-requires ;
project : requirements $(c11-requires) ;

for local f in $(SOURCES)
{
Expand Down
⚡