Browse Source

Fixes for FreeBSD build

default_compile_flags
vector-of-bool 3 years ago
parent
commit
350e086507
4 changed files with 9 additions and 6 deletions
  1. +1
    -0
      Makefile
  2. +1
    -1
      src/dds.main.cpp
  3. +4
    -4
      tools/dds_ci/bootstrap.py
  4. +3
    -1
      tools/freebsd-gcc-10.jsonc

+ 1
- 0
Makefile View File

vagrant up freebsd11 vagrant up freebsd11
vagrant rsync vagrant rsync
vagrant ssh freebsd11 -c '\ vagrant ssh freebsd11 -c '\
export PATH=$$PATH:$$HOME/.local/bin && \
cd /vagrant && \ cd /vagrant && \
make full-ci \ make full-ci \
' '

+ 1
- 1
src/dds.main.cpp View File

auto result = boost::leaf::try_catch( auto result = boost::leaf::try_catch(
[&]() -> std::optional<int> { [&]() -> std::optional<int> {
parser.parse_argv(argv); parser.parse_argv(argv);
return {};
return std::nullopt;
}, },
[&](debate::help_request, debate::e_argument_parser p) { [&](debate::help_request, debate::e_argument_parser p) {
std::cout << p.parser.help_string(program_name); std::cout << p.parser.help_string(program_name);

+ 4
- 4
tools/dds_ci/bootstrap.py View File

if ret_dds.exists(): if ret_dds.exists():
return ret_dds return ret_dds


_clone_self_at(p6_dir, '0.1.0-alpha.6')
_clone_self_at(p6_dir, '0.1.0-alpha.6-bootstrap')
tc = 'msvc-rel.jsonc' if platform.system() == 'Windows' else 'gcc-9-rel.jsonc' tc = 'msvc-rel.jsonc' if platform.system() == 'Windows' else 'gcc-9-rel.jsonc'


catalog_arg = f'--catalog={p6_dir}/_catalog.db' catalog_arg = f'--catalog={p6_dir}/_catalog.db'
if ret_dds.exists(): if ret_dds.exists():
return ret_dds return ret_dds


_clone_self_at(p5_dir, 'bootstrap-p5')
_clone_self_at(p5_dir, 'bootstrap-p5.2')
build_py = p5_dir / 'tools/build.py' build_py = p5_dir / 'tools/build.py'
proc.check_run( proc.check_run(
[ [
if ret_dds.exists(): if ret_dds.exists():
return ret_dds return ret_dds


_clone_self_at(p4_dir, 'bootstrap-p4')
_clone_self_at(p4_dir, 'bootstrap-p4.2')
build_py = p4_dir / 'tools/build.py' build_py = p4_dir / 'tools/build.py'
proc.check_run( proc.check_run(
[ [
if ret_dds.exists(): if ret_dds.exists():
return ret_dds return ret_dds


_clone_self_at(p1_dir, 'bootstrap-p1')
_clone_self_at(p1_dir, 'bootstrap-p1.2')
build_py = p1_dir / 'tools/build.py' build_py = p1_dir / 'tools/build.py'
proc.check_run([ proc.check_run([
sys.executable, sys.executable,

+ 3
- 1
tools/freebsd-gcc-10.jsonc View File

], ],
"link_flags": [ "link_flags": [
"-static-libgcc", "-static-libgcc",
"-static-libstdc++"
"-static-libstdc++",
"-l:libssl.a",
"-l:libcrypto.a",
], ],
"optimize": true "optimize": true
} }

Loading…
Cancel
Save